tss.h File Reference

8259.c File Reference

8259.c File Reference

8259.h File Reference

_types.h File Reference

arp.h File Reference

arp.h File Reference

assert.h File Reference

atan.c File Reference

atkbd.h File Reference

bioscall.h File Reference

cdefs.h File Reference

UbixOS V2 Data Structure Index

ogDisplay_UbixOS Class Reference

createvirtualspace.c File Reference

device.old.h File Reference

dirCache.h File Reference

devfs Directory Reference

devfs Directory Reference

ubixfs Directory Reference

ubixfs Directory Reference

devfs Directory Reference

devfs Directory Reference

isa Directory Reference

isa Directory Reference

vfs Directory Reference

vfs Directory Reference

ufs Directory Reference

ufs Directory Reference

isa Directory Reference

isa Directory Reference

lib Directory Reference

lib Directory Reference

sde Directory Reference

sde Directory Reference

Functions

Variables

Variable Documentation

Defines

Functions

Function Documentation

Typedefs

Functions

Function Documentation

Variable Documentation

Functions

Defines

Functions

Define Documentation

Function Documentation

Functions

Functions

Variable Documentation

Defines

Defines

Functions

Defines

Functions

Data Structures

Defines

Public Member Functions

Functions

Variable Documentation

Functions

Functions

Variable Documentation

Data Structures

Functions

Variable Documentation

Data Structures

Functions

Variable Documentation

Data Structures

Files

Files

Files

Files

Files

Files

Files

Files

@@ -245,45 +207,10 @@

src/sys/include/net/api.h

src/sys/include/net/api_msg.h

src/sys/include/net/arch.h

src/sys/include/net/debug.h

src/sys/include/net/def.h

src/sys/include/net/err.h

src/sys/include/net/list.h

src/sys/include/net/lwipopts.h

src/sys/include/net/mem.h

src/sys/include/net/memp.h

src/sys/include/net/net.h

src/sys/include/net/netif.h

src/sys/include/net/opt.h

src/sys/include/net/pbuf.h

src/sys/include/net/sockets.h

src/sys/include/net/stats.h

src/sys/include/net/sys.h

src/sys/include/net/tcp.h

src/sys/include/net/tcpip.h

src/sys/include/net/udp.h

src/sys/include/net/arch/cc.h

src/sys/include/net/arch/cpu.h

src/sys/include/net/arch/init.h

src/sys/include/net/arch/lib.h

src/sys/include/net/arch/perf.h

src/sys/include/net/arch/sys_arch.h

src/sys/include/net/ipv4/icmp.h

src/sys/include/net/ipv4/inet.h

src/sys/include/net/ipv4/ip.h

src/sys/include/net/ipv4/ip_addr.h

src/sys/include/net/ipv6/icmp.h

src/sys/include/net/ipv6/inet.h

src/sys/include/net/ipv6/ip.h

src/sys/include/net/ipv6/ip_addr.h

src/sys/include/netif/arp.h

src/sys/include/netif/ethernetif.h

src/sys/include/netif/loopif.h

src/sys/include/netif/tcpdump.h

src/sys/include/objgfx/ogDisplay_VESA.h

src/sys/include/pci/hd.h

src/sys/include/pci/lnc.h

src/sys/include/pci/pci.h

@@ -316,7 +243,7 @@

src/sys/include/ubixos/endtask.h

src/sys/include/ubixos/exec.h

src/sys/include/ubixos/fork.h

src/sys/include/ubixos/init.h

src/sys/include/ubixos/kmod.h

src/sys/include/ubixos/kpanic.h

src/sys/include/ubixos/ld.h

@@ -402,22 +329,6 @@

src/sys/lib/vsprintf.c

src/sys/mpi/message.c

src/sys/mpi/system.c

src/sys/net/api/api_lib.c

src/sys/net/api/api_msg.c

src/sys/net/api/err.c

src/sys/net/api/sockets.c

src/sys/net/api/tcpip.c

src/sys/net/net/bot.c

src/sys/net/net/init.c

src/sys/net/net/shell.c

src/sys/net/net/shell.h

src/sys/net/net/sys_arch.c

src/sys/net/net/udpecho.c

src/sys/net/net/udpecho.h

src/sys/net/netif/arp.c

src/sys/net/netif/ethernetif.c

src/sys/net/netif/loopif.c

src/sys/net/netif/tcpdump.c

src/sys/pci/hd.c

src/sys/pci/lnc.c

src/sys/pci/pci.c

@@ -455,22 +366,18 @@

@@ -478,8 +385,8 @@

@@ -487,80 +394,30 @@

@@ -583,18 +440,18 @@

@@ -615,19 +472,19 @@

@@ -636,14 +493,14 @@

@@ -652,8 +509,8 @@

@@ -683,12 +540,12 @@

@@ -708,88 +565,59 @@

diff --git a/doc/html/tss_8h-source.html b/doc/html/tss_8h-source.html index faf062b..556d04e 100644 --- a/doc/html/tss_8h-source.html +++ b/doc/html/tss_8h-source.html @@ -169,7 +169,7 @@ 00138 00139 END 00140 ***/ -

Generated on Tue Dec 12 08:52:05 2006 for UbixOS V2 by +

Generated on Tue Dec 12 09:59:41 2006 for UbixOS V2 by

1.4.7

diff --git a/doc/html/tss_8h.html b/doc/html/tss_8h.html index 0c70ea0..604ecba 100644 --- a/doc/html/tss_8h.html +++ b/doc/html/tss_8h.html @@ -32,6 +32,21 @@

#include <ubixos/types.h>

+Include dependency graph for tss.h:

+ + + + + +

+This graph shows which files directly or indirectly include this file:

+ + + + + + +

Go to the source code of this file. @@ -42,7 +57,7 @@

Data Structures
struct tssStruct

-

Generated on Tue Dec 12 08:52:11 2006 for UbixOS V2 by +

Generated on Tue Dec 12 10:01:56 2006 for UbixOS V2 by

1.4.7

diff --git a/doc/html/tty_8c-source.html b/doc/html/tty_8c-source.html index e65fe7f..d14bdc1 100644 --- a/doc/html/tty_8c-source.html +++ b/doc/html/tty_8c-source.html @@ -205,7 +205,7 @@ 00174 /*** 00175 END 00176 ***/ -

Generated on Tue Dec 12 08:52:06 2006 for UbixOS V2 by +

Generated on Tue Dec 12 09:59:42 2006 for UbixOS V2 by

1.4.7

diff --git a/doc/html/tty_8c.html b/doc/html/tty_8c.html index 12e8b85..775ba5b 100644 --- a/doc/html/tty_8c.html +++ b/doc/html/tty_8c.html @@ -38,6 +38,20 @@ #include <string.h>

+Include dependency graph for tty.c:

+ + + + + + + + + + + + +

Go to the source code of this file. @@ -82,6 +96,19 @@ References kpanic(), memcpy(), outportByte(), terms, tty_termNode::tty_buffer, tty_foreground, TTY_MAX_TERMS, tty_termNode::tty_pointer, tty_termNode::tty_x, and tty_termNode::tty_y.
Referenced by keyboardHandler(). +
+Here is the call graph for this function:
+ + + + + + + + + + +
@@ -131,6 +158,22 @@ Definition at line 42 of file tty.c.
References inportByte(), kmalloc(), kpanic(), kprintf(), outportByte(), terms, tty_termNode::tty_buffer, tty_termNode::tty_colour, tty_foreground, TTY_MAX_TERMS, tty_termNode::tty_pointer, tty_termNode::tty_x, and tty_termNode::tty_y. +
+Here is the call graph for this function:
+ + + + + + + + + + + + + +
@@ -166,6 +209,19 @@ References outportByte(), spinLock(), spinUnlock(), tty_termNode::tty_colour, tty_foreground, tty_termNode::tty_pointer, tty_spinLock, tty_termNode::tty_x, tty_termNode::tty_y, and x20.
Referenced by kprint(), and sysFwrite(). +
+Here is the call graph for this function:
+ + + + + + + + + + +

Variable Documentation
@@ -226,7 +282,7 @@ Referenced by tty_print().
-
Generated on Tue Dec 12 08:52:15 2006 for UbixOS V2 by +
Generated on Tue Dec 12 10:06:06 2006 for UbixOS V2 by 1.4.7
diff --git a/doc/html/tty_8h-source.html b/doc/html/tty_8h-source.html index b7dadb3..e3e5032 100644 --- a/doc/html/tty_8h-source.html +++ b/doc/html/tty_8h-source.html @@ -121,7 +121,7 @@ 00090 END 00091 ***/ 00092 -
Generated on Tue Dec 12 08:52:05 2006 for UbixOS V2 by +
Generated on Tue Dec 12 09:59:41 2006 for UbixOS V2 by 1.4.7
diff --git a/doc/html/tty_8h.html b/doc/html/tty_8h.html index 95a57c1..ab03835 100644 --- a/doc/html/tty_8h.html +++ b/doc/html/tty_8h.html @@ -32,6 +32,26 @@
tty.h File Reference
#include <ubixos/types.h>

+Include dependency graph for tty.h:
+ + + + + +
+This graph shows which files directly or indirectly include this file:
+ + + + + + + + + + + +
Go to the source code of this file.

Functions

@@ -117,6 +137,19 @@ References kpanic(), memcpy(), outportByte(), terms, tty_termNode::tty_buffer, tty_foreground, TTY_MAX_TERMS, tty_termNode::tty_pointer, tty_termNode::tty_x, and tty_termNode::tty_y.
Referenced by keyboardHandler(). +
+Here is the call graph for this function:
+ + + + + + + + + + +
@@ -166,6 +199,22 @@ Definition at line 42 of file tty.c.
References inportByte(), kmalloc(), kpanic(), kprintf(), outportByte(), terms, tty_termNode::tty_buffer, tty_termNode::tty_colour, tty_foreground, TTY_MAX_TERMS, tty_termNode::tty_pointer, tty_termNode::tty_x, and tty_termNode::tty_y. +
+Here is the call graph for this function:
+ + + + + + + + + + + + + +
@@ -201,6 +250,19 @@ References outportByte(), spinLock(), spinUnlock(), tty_termNode::tty_colour, tty_foreground, tty_termNode::tty_pointer, tty_spinLock, tty_termNode::tty_x, tty_termNode::tty_y, and x20.
Referenced by kprint(), and sysFwrite(). +
+Here is the call graph for this function:
+ + + + + + + + + + +

Variable Documentation
@@ -223,7 +285,7 @@ Referenced by backSpace(), getch(), keyboardHandler(), kpanic(), kprint(), sysFgetc(), tty_change(), tty_init(), and tty_print().
-
Generated on Tue Dec 12 08:52:13 2006 for UbixOS V2 by +
Generated on Tue Dec 12 10:03:10 2006 for UbixOS V2 by 1.4.7
diff --git a/doc/html/ubixfs_8c-source.html b/doc/html/ubixfs_8c-source.html index 48cb5e7..a3ae5f5 100644 --- a/doc/html/ubixfs_8c-source.html +++ b/doc/html/ubixfs_8c-source.html @@ -77,7 +77,7 @@ 00046 static int openFileUbixFS(const char *file, fileDescriptor *fd) { 00047 //int x = 0; 00048 /* mji struct directoryEntry *dirEntry = (struct directoryEntry *)kmalloc(0x4000); */ -00049 struct cacheNode * cacheNode = NULL; +00049 struct cacheNode * cacheNode = NULL; 00050 //struct directoryEntry * dirEntry = NULL; 00051 struct ubixFSInfo *fsInfo = fd->mp->fsInfo; 00052 @@ -98,10 +98,10 @@ 00067 if ((fd->mode & fileRead) == fileRead) { 00068 do { 00069 cacheNode = ubixfs_cacheFind(fsInfo->dirCache,(char *) file); -00070 if (cacheNode == NULL) return 0; +00070 if (cacheNode == NULL) return 0; 00071 if (cacheNode->present == 1) break; 00072 assert(cacheNode->size); -00073 if (*cacheNode->size != 0 && cacheNode->info == NULL) { +00073 if (*cacheNode->size != 0 && cacheNode->info == NULL) { 00074 //kprintf("caching name(size): %s(%d)\n",cacheNode->name,*cacheNode->size); 00075 cacheNode->info = kmalloc(UBIXFS_ALIGN(*cacheNode->size)); 00076 fd->size = *cacheNode->size; @@ -115,7 +115,7 @@ 00084 } while(1); 00085 00086 assert(cacheNode); -00087 if (cacheNode == NULL) return 0; /* this should be caught above */ +00087 if (cacheNode == NULL) return 0; /* this should be caught above */ 00088 00089 fd->start = *cacheNode->startCluster; 00090 fd->size = *cacheNode->size; @@ -151,7 +151,7 @@ 00120 int blockCount = 0x0,batIndex = 0x0,batIndexPrev = 0x0; 00121 uInt32 i = 0x0; 00122 struct directoryEntry *dirEntry = 0x0; -00123 struct ubixFSInfo *fsInfo = NULL; +00123 struct ubixFSInfo *fsInfo = NULL; 00124 00125 assert(fd); 00126 assert(fd->mp); @@ -164,7 +164,7 @@ 00133 blockCount = (offset/4096); 00134 00135 /* Find The Block If It Doesn't Exist We Will Have To Allocate One */ -00136 for (i=0x0; i <= fd->mp->diskLabel->partitions[fd->mp->partition].pBatSize; +00136 for (i=0x0; i <= fd->mp->diskLabel->partitions[fd->mp->partition].pBatSize; 00137 i++) { 00138 batIndex = fsInfo->blockAllocationTable[batIndexPrev].nextBlock; 00139 if (batIndex == 0x0) { @@ -224,8 +224,8 @@ 00193 00194 int readUbixFS(fileDescriptor *fd,char *data,uInt32 offset,long size) { 00195 int i = 0x0; -00196 char *buffer = 0x0; -00197 struct ubixFSInfo *fsInfo = NULL; +00196 char *buffer = 0x0; +00197 struct ubixFSInfo *fsInfo = NULL; 00198 00199 assert(fd); 00200 assert(fd->mp); @@ -265,7 +265,7 @@ 00234 uInt32 blockIndex; 00235 uInt32 blockIndexPrev; 00236 uInt32 i = 0x0; -00237 struct ubixFSInfo *fsInfo = NULL; +00237 struct ubixFSInfo *fsInfo = NULL; 00238 struct directoryEntry *dirEntry = 0x0; 00239 00240 assert(fd); @@ -292,7 +292,7 @@ 00261 } 00262 } 00263 -00264 fd->mp->device->devInfo->read(fd->mp->device->devInfo->info,fd->buffer,fd->mp->diskLabel->partitions[fd->mp->partition].pOffset+fsInfo->blockAllocationTable[blockIndex].realSector,blockSize); +00264 fd->mp->device->devInfo->read(fd->mp->device->devInfo->info,fd->buffer,fd->mp->diskLabel->partitions[fd->mp->partition].pOffset+fsInfo->blockAllocationTable[blockIndex].realSector,blockSize); 00265 for (i = 0x0;i < (uInt32)size;i++) { 00266 00267 fd->buffer[(offset- (blockOffset *0x1000))] = data[i]; @@ -300,7 +300,7 @@ 00269 00270 if (offset%4096 == 0x0) { 00271 blockOffset++; -00272 fd->mp->device->devInfo->write(fd->mp->device->devInfo->info,fd->buffer,fd->mp->diskLabel->partitions[fd->mp->partition].pOffset+fsInfo->blockAllocationTable[blockIndex].realSector,blockSize); +00272 fd->mp->device->devInfo->write(fd->mp->device->devInfo->info,fd->buffer,fd->mp->diskLabel->partitions[fd->mp->partition].pOffset+fsInfo->blockAllocationTable[blockIndex].realSector,blockSize); 00273 00274 if (fsInfo->blockAllocationTable[blockIndex].nextBlock == EOBC) { 00275 blockIndexPrev = blockIndex; @@ -310,11 +310,11 @@ 00279 } 00280 else { 00281 blockIndex = fsInfo->blockAllocationTable[blockIndex].nextBlock; -00282 fd->mp->device->devInfo->read(fd->mp->device->devInfo->info,fd->buffer,fd->mp->diskLabel->partitions[fd->mp->partition].pOffset+fsInfo->blockAllocationTable[blockIndex].realSector,blockSize); +00282 fd->mp->device->devInfo->read(fd->mp->device->devInfo->info,fd->buffer,fd->mp->diskLabel->partitions[fd->mp->partition].pOffset+fsInfo->blockAllocationTable[blockIndex].realSector,blockSize); 00283 } 00284 } 00285 } -00286 fd->mp->device->devInfo->write(fd->mp->device->devInfo->info,fd->buffer,fd->mp->diskLabel->partitions[fd->mp->partition].pOffset+fsInfo->blockAllocationTable[blockIndex].realSector,blockSize); +00286 fd->mp->device->devInfo->write(fd->mp->device->devInfo->info,fd->buffer,fd->mp->diskLabel->partitions[fd->mp->partition].pOffset+fsInfo->blockAllocationTable[blockIndex].realSector,blockSize); 00287 00288 if ((uInt32)offset > fd->size) { 00289 fd->size = offset; @@ -342,13 +342,13 @@ 00311 struct directoryEntry *dirEntry = (struct directoryEntry *)kmalloc(0x1000); 00312 struct ubixFSInfo *fsInfo = mp->fsInfo; 00313 -00314 mp->device->devInfo->read(mp->device->devInfo->info,dirEntry,(mp->diskLabel->partitions[mp->partition].pOffset+fsInfo->blockAllocationTable[fsInfo->rootDir].realSector),8); +00314 mp->device->devInfo->read(mp->device->devInfo->info,dirEntry,(mp->diskLabel->partitions[mp->partition].pOffset+fsInfo->blockAllocationTable[fsInfo->rootDir].realSector),8); 00315 00316 for (x=0;(uInt32)x<(4096/sizeof(struct directoryEntry));x++) { 00317 if ((int)!strcmp(dirEntry[x].fileName,path)) { 00318 dirEntry[x].attributes |= typeDeleted; 00319 dirEntry[x].fileName[0] = '?'; -00320 mp->device->devInfo->write(mp->device->devInfo->info,dirEntry,(mp->diskLabel->partitions[mp->partition].pOffset+fsInfo->blockAllocationTable[fsInfo->rootDir].realSector),8); +00320 mp->device->devInfo->write(mp->device->devInfo->info,dirEntry,(mp->diskLabel->partitions[mp->partition].pOffset+fsInfo->blockAllocationTable[fsInfo->rootDir].realSector),8); 00321 return; 00322 } 00323 } @@ -372,7 +372,7 @@ 00341 static int ubixfs_loadData(fileDescriptor *fd,char *data,uInt32 size,uInt32 batIndex) { 00342 uInt32 i = 0x0; 00343 -00344 struct ubixFSInfo *fsInfo = NULL; +00344 struct ubixFSInfo *fsInfo = NULL; 00345 00346 assert(fd); 00347 assert(fd->mp); @@ -388,7 +388,7 @@ 00357 if (i != 0x0) 00358 batIndex = fsInfo->blockAllocationTable[batIndex].nextBlock; 00359 /* Read data in from media */ -00360 fd->mp->device->devInfo->read(fd->mp->device->devInfo->info,data+i,fd->mp->diskLabel->partitions[fd->mp->partition].pOffset+fsInfo->blockAllocationTable[batIndex].realSector,blockSize); +00360 fd->mp->device->devInfo->read(fd->mp->device->devInfo->info,data+i,fd->mp->diskLabel->partitions[fd->mp->partition].pOffset+fsInfo->blockAllocationTable[batIndex].realSector,blockSize); 00361 } 00362 /* Return */ 00363 return(0x0); @@ -409,7 +409,7 @@ 00378 00379 assert(mp); 00380 assert(mp->diskLabel); -00381 assert(mp->diskLabel->partitions); +00381 assert(mp->diskLabel->partitions); 00382 00383 mp->fsInfo = (struct ubixFSInfo *)kmalloc(sizeof(struct ubixFSInfo)); 00384 assert(mp->fsInfo); @@ -423,18 +423,18 @@ 00392 if ((mp->diskLabel->magicNum == UBIXDISKMAGIC) && (mp->diskLabel->magicNum2 == UBIXDISKMAGIC)) { 00393 00394 /* Allocate memory for BAT */ -00395 fsInfo->blockAllocationTable = (struct blockAllocationTableEntry *)kmalloc(mp->diskLabel->partitions[mp->partition].pBatSize * 512); +00395 fsInfo->blockAllocationTable = (struct blockAllocationTableEntry *)kmalloc(mp->diskLabel->partitions[mp->partition].pBatSize * 512); 00396 assert(fsInfo->blockAllocationTable); 00397 00398 /* Set up the amount of BAT entries */ -00399 fsInfo->batEntries = (mp->diskLabel->partitions[mp->partition].pBatSize*512) / sizeof(struct blockAllocationTableEntry); +00399 fsInfo->batEntries = (mp->diskLabel->partitions[mp->partition].pBatSize*512) / sizeof(struct blockAllocationTableEntry); 00400 00401 /* Read the BAT to memory */ 00402 assert(mp->device->devInfo->read); 00403 mp->device->devInfo->read(mp->device->devInfo->info, 00404 fsInfo->blockAllocationTable, -00405 mp->diskLabel->partitions[mp->partition].pOffset, -00406 mp->diskLabel->partitions[mp->partition].pBatSize); +00405 mp->diskLabel->partitions[mp->partition].pOffset, +00406 mp->diskLabel->partitions[mp->partition].pBatSize); 00407 00408 /* Set up root directory cache */ 00409 fsInfo->dirCache = ubixfs_cacheNew("/"); @@ -453,7 +453,7 @@ 00422 /* Read root dir in from disk it is always 0x4000 bytes long */ 00423 mp->device->devInfo->read(mp->device->devInfo->info, 00424 fsInfo->dirCache->info, -00425 (mp->diskLabel->partitions[mp->partition].pOffset+fsInfo->blockAllocationTable[fsInfo->rootDir].realSector), +00425 (mp->diskLabel->partitions[mp->partition].pOffset+fsInfo->blockAllocationTable[fsInfo->rootDir].realSector), 00426 0x4000 / 512); 00427 00428 /* Start our ubixfs_thread to manage the mount point */ @@ -462,7 +462,7 @@ 00431 execThread(ubixfs_Thread,(uInt32)(kmalloc(0x2000)+0x2000),0x0); 00432 */ 00433 kprintf(" Offset: [%i], Partition: [%i]\n", -00434 mp->diskLabel->partitions[mp->partition].pOffset,mp->partition); +00434 mp->diskLabel->partitions[mp->partition].pOffset,mp->partition); 00435 kprintf("UbixFS Initialized\n"); 00436 return(0x1); 00437 } @@ -487,8 +487,8 @@ 00456 int ubixfs_init() { 00457 /* Set up our file system structure */ 00458 struct fileSystem ubixFileSystem = -00459 {NULL, /* prev */ -00460 NULL, /* next */ +00459 {NULL, /* prev */ +00460 NULL, /* next */ 00461 (void *)ubixfs_initialize, /* vfsInitFS */ 00462 (void *)readUbixFS, /* vfsRead */ 00463 (void *)writeUbixFS, /* vfsWrite */ @@ -672,7 +672,7 @@ 00641 END 00642 ***/ 00643 -
Generated on Tue Dec 12 08:52:08 2006 for UbixOS V2 by +
Generated on Tue Dec 12 09:59:42 2006 for UbixOS V2 by 1.4.7
diff --git a/doc/html/ubixfs_8c.html b/doc/html/ubixfs_8c.html index f0171c4..197fc0c 100644 --- a/doc/html/ubixfs_8c.html +++ b/doc/html/ubixfs_8c.html @@ -42,6 +42,24 @@ #include <assert.h>

+Include dependency graph for ubixfs.c:
+ + + + + + + + + + + + + + + + +
Go to the source code of this file.

Data Structures
@@ -93,9 +111,26 @@
Definition at line 46 of file ubixfs.c.
-References assert, fileDescriptorStruct::cacheNode, vfs_mountPoint::device, device_node::devInfo, ubixFSInfo::dirCache, fileRead, fileWrite, vfs_mountPoint::fsInfo, cacheNode::info, kmalloc(), kprintf(), fileDescriptorStruct::mode, fileDescriptorStruct::mp, NULL, cacheNode::permissions, fileDescriptorStruct::perms, cacheNode::present, device_interface::read, fileDescriptorStruct::size, cacheNode::size, fileDescriptorStruct::start, cacheNode::startCluster, UBIXFS_ALIGN, ubixfs_cacheFind(), ubixfs_loadData(), and x1. +References assert, fileDescriptorStruct::cacheNode, vfs_mountPoint::device, device_node::devInfo, ubixFSInfo::dirCache, fileRead, fileWrite, vfs_mountPoint::fsInfo, cacheNode::info, kmalloc(), kprintf(), fileDescriptorStruct::mode, fileDescriptorStruct::mp, NULL, cacheNode::permissions, fileDescriptorStruct::perms, cacheNode::present, device_interface::read, fileDescriptorStruct::size, cacheNode::size, fileDescriptorStruct::start, cacheNode::startCluster, UBIXFS_ALIGN, ubixfs_cacheFind(), ubixfs_loadData(), and x1.
Referenced by ubixfs_init(). +
+Here is the call graph for this function:
+ + + + + + + + + + + + + + +
@@ -140,9 +175,20 @@
Definition at line 194 of file ubixfs.c.
-References assert, buffer, fileDescriptorStruct::cacheNode, fdEof, vfs_mountPoint::fsInfo, cacheNode::info, kpanic(), fileDescriptorStruct::mp, NULL, cacheNode::present, fileDescriptorStruct::size, and fileDescriptorStruct::status. +References assert, fileDescriptorStruct::cacheNode, fdEof, vfs_mountPoint::fsInfo, cacheNode::info, kpanic(), fileDescriptorStruct::mp, NULL, cacheNode::present, fileDescriptorStruct::size, and fileDescriptorStruct::status.
Referenced by addDirEntry(), and ubixfs_init(). +
+Here is the call graph for this function:
+ + + + + + + + +
@@ -165,7 +211,33 @@
Definition at line 456 of file ubixfs.c.
-References kpanic(), NULL, openFileUbixFS(), readUbixFS(), ubixfs_initialize(), ubixFSmkDir(), ubixFSUnlink(), vfsRegisterFS(), writeUbixFS(), and x1. +References kpanic(), NULL, openFileUbixFS(), readUbixFS(), ubixfs_initialize(), ubixFSmkDir(), ubixFSUnlink(), vfsRegisterFS(), writeUbixFS(), and x1. +
+Here is the call graph for this function:
+ + + + + + + + + + + + + + + + + + + + + + + +
@@ -189,7 +261,22 @@
Definition at line 376 of file ubixfs.c.
-References assert, cacheNode::attributes, ubixFSInfo::batEntries, ubixFSInfo::blockAllocationTable, vfs_mountPoint::device, device_node::devInfo, ubixFSInfo::dirCache, vfs_mountPoint::diskLabel, vfs_mountPoint::fsInfo, cacheNode::info, device_interface::info, kmalloc(), kprintf(), ubixDiskLabel::magicNum, ubixDiskLabel::magicNum2, vfs_mountPoint::partition, ubixDiskLabel::partitions, ubixDiskLabel::ubixPartitions::pBatSize, cacheNode::permissions, cacheNode::present, device_interface::read, ubixFSInfo::rootDir, cacheNode::size, cacheNode::startCluster, UBIXDISKMAGIC, ubixfs_cacheNew(), and x1. +References assert, cacheNode::attributes, ubixFSInfo::batEntries, ubixFSInfo::blockAllocationTable, vfs_mountPoint::device, device_node::devInfo, ubixFSInfo::dirCache, vfs_mountPoint::diskLabel, vfs_mountPoint::fsInfo, cacheNode::info, device_interface::info, kmalloc(), kprintf(), ubixDiskLabel::magicNum, ubixDiskLabel::magicNum2, vfs_mountPoint::partition, ubixDiskLabel::partitions, ubixDiskLabel::ubixPartitions::pBatSize, cacheNode::permissions, cacheNode::present, device_interface::read, ubixFSInfo::rootDir, cacheNode::size, cacheNode::startCluster, UBIXDISKMAGIC, ubixfs_cacheNew(), and x1. +
+Here is the call graph for this function:
+ + + + + + + + + + + + +
@@ -234,7 +321,7 @@
Definition at line 341 of file ubixfs.c.
-References assert, ubixFSInfo::blockAllocationTable, blockSize, vfs_mountPoint::device, device_node::devInfo, vfs_mountPoint::diskLabel, vfs_mountPoint::fsInfo, device_interface::info, fileDescriptorStruct::mp, blockAllocationTableEntry::nextBlock, NULL, vfs_mountPoint::partition, ubixDiskLabel::partitions, device_interface::read, blockAllocationTableEntry::realSector, UBIXFS_ALIGN, and UBIXFS_BLOCKSIZE_BYTES. +References assert, ubixFSInfo::blockAllocationTable, blockSize, vfs_mountPoint::device, device_node::devInfo, vfs_mountPoint::diskLabel, vfs_mountPoint::fsInfo, device_interface::info, fileDescriptorStruct::mp, blockAllocationTableEntry::nextBlock, NULL, vfs_mountPoint::partition, ubixDiskLabel::partitions, device_interface::read, blockAllocationTableEntry::realSector, UBIXFS_ALIGN, and UBIXFS_BLOCKSIZE_BYTES.
Referenced by openFileUbixFS(). @@ -269,9 +356,24 @@
Definition at line 309 of file ubixfs.c.
-References ubixFSInfo::blockAllocationTable, vfs_mountPoint::device, device_node::devInfo, vfs_mountPoint::diskLabel, directoryEntry::fileName, vfs_mountPoint::fsInfo, device_interface::info, kmalloc(), kprintf(), vfs_mountPoint::partition, ubixDiskLabel::partitions, device_interface::read, ubixFSInfo::rootDir, strcmp(), typeDeleted, device_interface::write, and x1000. +References ubixFSInfo::blockAllocationTable, vfs_mountPoint::device, device_node::devInfo, vfs_mountPoint::diskLabel, directoryEntry::fileName, vfs_mountPoint::fsInfo, device_interface::info, kmalloc(), kprintf(), vfs_mountPoint::partition, ubixDiskLabel::partitions, device_interface::read, ubixFSInfo::rootDir, strcmp(), typeDeleted, device_interface::write, and x1000.
Referenced by ubixfs_init(). +
+Here is the call graph for this function:
+ + + + + + + + + + + + +
@@ -310,7 +412,7 @@
Definition at line 118 of file ubixfs.c.
-References assert, ubixFSInfo::blockAllocationTable, vfs_mountPoint::diskLabel, fdOpen, fdRead, vfs_mountPoint::fsInfo, fileDescriptorStruct::mp, blockAllocationTableEntry::nextBlock, NULL, vfs_mountPoint::partition, ubixDiskLabel::partitions, ubixDiskLabel::ubixPartitions::pBatSize, fileDescriptorStruct::start, and fileDescriptorStruct::status. +References assert, ubixFSInfo::blockAllocationTable, vfs_mountPoint::diskLabel, fdOpen, fdRead, vfs_mountPoint::fsInfo, fileDescriptorStruct::mp, blockAllocationTableEntry::nextBlock, NULL, vfs_mountPoint::partition, ubixDiskLabel::partitions, ubixDiskLabel::ubixPartitions::pBatSize, fileDescriptorStruct::start, and fileDescriptorStruct::status.
@@ -355,12 +457,32 @@
Definition at line 232 of file ubixfs.c.
-References assert, ubixFSInfo::blockAllocationTable, blockSize, fileDescriptorStruct::buffer, vfs_mountPoint::device, device_node::devInfo, vfs_mountPoint::diskLabel, EOBC, fileDescriptorStruct::fileName, directoryEntry::fileName, vfs_mountPoint::fsInfo, getFreeBlocks(), device_interface::info, kfree(), kmalloc(), fileDescriptorStruct::mp, blockAllocationTableEntry::nextBlock, NULL, vfs_mountPoint::partition, ubixDiskLabel::partitions, device_interface::read, blockAllocationTableEntry::realSector, directoryEntry::size, fileDescriptorStruct::size, fileDescriptorStruct::start, directoryEntry::startCluster, strcmp(), device_interface::write, and x1000. +References assert, ubixFSInfo::blockAllocationTable, blockSize, fileDescriptorStruct::buffer, vfs_mountPoint::device, device_node::devInfo, vfs_mountPoint::diskLabel, EOBC, fileDescriptorStruct::fileName, directoryEntry::fileName, vfs_mountPoint::fsInfo, getFreeBlocks(), device_interface::info, kfree(), kmalloc(), fileDescriptorStruct::mp, blockAllocationTableEntry::nextBlock, NULL, vfs_mountPoint::partition, ubixDiskLabel::partitions, device_interface::read, blockAllocationTableEntry::realSector, directoryEntry::size, fileDescriptorStruct::size, fileDescriptorStruct::start, directoryEntry::startCluster, strcmp(), device_interface::write, and x1000.
Referenced by addDirEntry(), and ubixfs_init(). +
+Here is the call graph for this function:
+ + + + + + + + + + + + + + + + + +
-
Generated on Tue Dec 12 08:52:16 2006 for UbixOS V2 by +
Generated on Tue Dec 12 10:07:58 2006 for UbixOS V2 by 1.4.7
diff --git a/doc/html/ubthread_8c-source.html b/doc/html/ubthread_8c-source.html index 92fcbfe..55539b9 100644 --- a/doc/html/ubthread_8c-source.html +++ b/doc/html/ubthread_8c-source.html @@ -163,7 +163,7 @@ 00132 END 00133 ***/ 00134 -
Generated on Tue Dec 12 08:52:06 2006 for UbixOS V2 by +
Generated on Tue Dec 12 09:59:42 2006 for UbixOS V2 by 1.4.7
diff --git a/doc/html/ubthread_8c.html b/doc/html/ubthread_8c.html index 216f24f..ee938e8 100644 --- a/doc/html/ubthread_8c.html +++ b/doc/html/ubthread_8c.html @@ -39,6 +39,22 @@ #include <lib/kprintf.h>

+Include dependency graph for ubthread.c:
+ + + + + + + + + + + + + + +
Go to the source code of this file.

Functions
@@ -94,7 +110,26 @@
References kfree().
-Referenced by sys_sem_free_(). +Here is the call graph for this function:
+ + + + + + + + + + + + + + + + + + +
@@ -129,7 +164,19 @@
References ubthread_cond::id, kmalloc(), ubthread_cond::locked, and UNLOCKED.
-Referenced by sys_sem_new_(). +Here is the call graph for this function:
+ + + + + + + + + + + +
@@ -154,8 +201,6 @@ Definition at line 125 of file ubthread.c.
References ubthread_cond::locked, and UNLOCKED. -
-Referenced by sys_sem_signal().
@@ -196,7 +241,15 @@
References ubthread_mutex::locked, ubthread_cond::locked, mutex, sched_yield(), systemVitals, vitalsStruct::sysUptime, and UNLOCKED.
-Referenced by cond_wait(). +Here is the call graph for this function:
+ + + + + + + +
@@ -231,7 +284,15 @@
References ubthread_mutex::locked, LOCKED, ubthread_cond::locked, mutex, sched_yield(), and UNLOCKED.
-Referenced by cond_wait(). +Here is the call graph for this function:
+ + + + + + + +
@@ -278,7 +339,22 @@
References execThread(), kmalloc(), and x2000.
-Referenced by sys_thread_new(). +Here is the call graph for this function:
+ + + + + + + + + + + + + + +
@@ -304,7 +380,26 @@
References kfree(), and mutex.
-Referenced by sys_sem_free_(). +Here is the call graph for this function:
+ + + + + + + + + + + + + + + + + + +
@@ -339,7 +434,19 @@
References ubthread_mutex::id, kmalloc(), ubthread_mutex::locked, mutex, and UNLOCKED.
-Referenced by sys_sem_new_(). +Here is the call graph for this function:
+ + + + + + + + + + + +
@@ -365,7 +472,11 @@
References _current, taskStruct::id, kprintf(), LOCKED, ubthread_mutex::locked, mutex, and ubthread_mutex::pid.
-Referenced by sys_arch_sem_wait(), and sys_sem_signal(). +Here is the call graph for this function:
+ + + +
@@ -390,8 +501,6 @@ Definition at line 92 of file ubthread.c.
References _current, taskStruct::id, ubthread_mutex::locked, mutex, ubthread_mutex::pid, and UNLOCKED. -
-Referenced by sys_arch_sem_wait(), and sys_sem_signal().
@@ -415,8 +524,6 @@ Definition at line 44 of file ubthread.c.
References _current. -
-Referenced by current_thread().

Variable Documentation
@@ -453,10 +560,10 @@
Definition at line 42 of file ubthread.c.
-Referenced by cond_wait(), ubthread_cond_timedwait(), ubthread_cond_wait(), ubthread_mutex_destroy(), ubthread_mutex_init(), ubthread_mutex_lock(), and ubthread_mutex_unlock(). +Referenced by ubthread_cond_timedwait(), ubthread_cond_wait(), ubthread_mutex_destroy(), ubthread_mutex_init(), ubthread_mutex_lock(), and ubthread_mutex_unlock().
-
Generated on Tue Dec 12 08:52:15 2006 for UbixOS V2 by +
Generated on Tue Dec 12 10:06:14 2006 for UbixOS V2 by 1.4.7
diff --git a/doc/html/ubthread_8h-source.html b/doc/html/ubthread_8h-source.html index fca8ff2..ed69dc7 100644 --- a/doc/html/ubthread_8h-source.html +++ b/doc/html/ubthread_8h-source.html @@ -139,7 +139,7 @@ 00108 00109 END 00110 ***/ -
Generated on Tue Dec 12 08:52:05 2006 for UbixOS V2 by +
Generated on Tue Dec 12 09:59:41 2006 for UbixOS V2 by 1.4.7
diff --git a/doc/html/ubthread_8h.html b/doc/html/ubthread_8h.html index d10a8ce..1d403b5 100644 --- a/doc/html/ubthread_8h.html +++ b/doc/html/ubthread_8h.html @@ -34,6 +34,43 @@ #include <ubixos/time.h>

+Include dependency graph for ubthread.h:
+ + + + + + + + + + + + + +
+This graph shows which files directly or indirectly include this file:
+ + + + + + + + + + + + + + + + + + + + +
Go to the source code of this file.

Functions
@@ -103,8 +140,6 @@
Definition at line 37 of file ubthread.h. -
-Referenced by cond_wait().
@@ -221,7 +256,26 @@
References kfree().
-Referenced by sys_sem_free_(). +Here is the call graph for this function:
+ + + + + + + + + + + + + + + + + + +
@@ -256,7 +310,19 @@
References ubthread_cond::id, kmalloc(), ubthread_cond::locked, and UNLOCKED.
-Referenced by sys_sem_new_(). +Here is the call graph for this function:
+ + + + + + + + + + + +
@@ -281,8 +347,6 @@ Definition at line 125 of file ubthread.c.
References ubthread_cond::locked, and UNLOCKED. -
-Referenced by sys_sem_signal().
@@ -323,7 +387,15 @@
References ubthread_cond::locked, ubthread_mutex::locked, mutex, sched_yield(), systemVitals, vitalsStruct::sysUptime, and UNLOCKED.
-Referenced by cond_wait(). +Here is the call graph for this function:
+ + + + + + + +
@@ -358,7 +430,15 @@
References ubthread_cond::locked, LOCKED, ubthread_mutex::locked, mutex, sched_yield(), and UNLOCKED.
-Referenced by cond_wait(). +Here is the call graph for this function:
+ + + + + + + +
@@ -405,7 +485,22 @@
References execThread(), kmalloc(), and x2000.
-Referenced by sys_thread_new(). +Here is the call graph for this function:
+ + + + + + + + + + + + + + +
@@ -431,7 +526,26 @@
References kfree(), and mutex.
-Referenced by sys_sem_free_(). +Here is the call graph for this function:
+ + + + + + + + + + + + + + + + + + +
@@ -466,7 +580,19 @@
References ubthread_mutex::id, kmalloc(), ubthread_mutex::locked, mutex, and UNLOCKED.
-Referenced by sys_sem_new_(). +Here is the call graph for this function:
+ + + + + + + + + + + +
@@ -492,7 +618,11 @@
References _current, taskStruct::id, kprintf(), ubthread_mutex::locked, LOCKED, mutex, and ubthread_mutex::pid.
-Referenced by sys_arch_sem_wait(), and sys_sem_signal(). +Here is the call graph for this function:
+ + + +
@@ -517,8 +647,6 @@ Definition at line 92 of file ubthread.c.
References _current, taskStruct::id, ubthread_mutex::locked, mutex, ubthread_mutex::pid, and UNLOCKED. -
-Referenced by sys_arch_sem_wait(), and sys_sem_signal().
@@ -542,11 +670,9 @@ Definition at line 44 of file ubthread.c.
References _current. -
-Referenced by current_thread().
-
Generated on Tue Dec 12 08:52:13 2006 for UbixOS V2 by +
Generated on Tue Dec 12 10:03:27 2006 for UbixOS V2 by 1.4.7
diff --git a/doc/html/ufs_8c-source.html b/doc/html/ufs_8c-source.html index 85077d6..f9cfcd7 100644 --- a/doc/html/ufs_8c-source.html +++ b/doc/html/ufs_8c-source.html @@ -124,9 +124,9 @@ 00093 u_int u; 00094 00095 -00096 blkbuf = fd->dmadat->blkbuf; -00097 indbuf = fd->dmadat->indbuf; -00098 fs = (struct fs *)fd->dmadat->sbbuf; +00096 blkbuf = fd->dmadat->blkbuf; +00097 indbuf = fd->dmadat->indbuf; +00098 fs = (struct fs *)fd->dmadat->sbbuf; 00099 00100 if (!fd->dsk_meta) { 00101 inomap = 0; @@ -193,10 +193,10 @@ 00162 lbn = lblkno(fs, fd->offset); 00163 off = blkoff(fs, fd->offset); 00164 if (lbn < NDADDR) { -00165 addr = DIP(di_db[lbn]); +00165 addr = DIP(di_db[lbn]); 00166 } else if (lbn < NDADDR + NINDIR(fs)) { 00167 n = INDIRPERVBLK(fs); -00168 addr = DIP(di_ib[0]); +00168 addr = DIP(di_ib[0]); 00169 u = (u_int)(lbn - NDADDR) / (n * DBPERVBLK); 00170 vbaddr = fsbtodb(fs, addr) + u; 00171 if (indmap != vbaddr) { @@ -252,7 +252,7 @@ 00221 while ((n = fsread(*ino, buf, DEV_BSIZE,fd)) > 0) 00222 for (s = buf; s < buf + DEV_BSIZE;) { 00223 d = (void *)s; -00224 if (!strcmp(name, d->d_name)) { +00224 if (!strcmp(name, d->d_name)) { 00225 *ino = d->d_fileno; 00226 return d->d_type; 00227 } @@ -345,8 +345,8 @@ 00314 int ufs_init() { 00315 /* Build our ufs struct */ 00316 struct fileSystem ufs = -00317 {NULL, /* prev */ -00318 NULL, /* next */ +00317 {NULL, /* prev */ +00318 NULL, /* next */ 00319 (void *)ufs_initialize, /* vfsInitFS */ 00320 (void *)ufs_readFile, /* vfsRead */ 00321 (void *)ufs_writeFile, /* vfsWrite */ @@ -371,7 +371,7 @@ 00340 END 00341 ***/ 00342 -
Generated on Tue Dec 12 08:52:08 2006 for UbixOS V2 by +
Generated on Tue Dec 12 09:59:42 2006 for UbixOS V2 by 1.4.7
diff --git a/doc/html/ufs_8c.html b/doc/html/ufs_8c.html index 30e486a..a0f1440 100644 --- a/doc/html/ufs_8c.html +++ b/doc/html/ufs_8c.html @@ -38,6 +38,24 @@ #include <lib/string.h>

+Include dependency graph for ufs.c:
+ + + + + + + + + + + + + + + + +
Go to the source code of this file.

Data Structures
@@ -353,7 +371,7 @@
Definition at line 51 of file ufs.c.
-References vfs_mountPoint::device, device_node::devInfo, device_interface::info, fileDescriptorStruct::mp, and device_interface::read. +References vfs_mountPoint::device, device_node::devInfo, device_interface::info, fileDescriptorStruct::mp, and device_interface::read.
Referenced by fsread(). @@ -397,6 +415,16 @@ References dirent::d_fileno, dirent::d_name, dirent::d_reclen, dirent::d_type, DEV_BSIZE, fsread(), fileDescriptorStruct::offset, and strcmp().
Referenced by lookup(). +
+Here is the call graph for this function:
+ + + + + + + +
@@ -444,6 +472,14 @@ References dmadat::blkbuf, blkoff, DBPERVBLK, DEV_BSHIFT, DEV_BSIZE, ufs2_dinode::di_db, ufs2_dinode::di_ib, ufs2_dinode::di_size, DIP, fileDescriptorStruct::dmadat, fileDescriptorStruct::dsk_meta, dskread(), fs::fs_magic, FS_UFS1_MAGIC, FS_UFS2_MAGIC, fsbtodb, dmadat::indbuf, INDIRPERVBLK, INO_TO_VBA, INO_TO_VBO, IPERVBLK, kprintf(), lblkno, MAXBSIZE, memcpy(), NDADDR, NINDIR, fileDescriptorStruct::offset, dmadat::sbbuf, sblksize, sblock_try, fileDescriptorStruct::size, VBLKMASK, VBLKSHIFT, and VBLKSIZE.
Referenced by fsfind(), ufs_openFile(), and ufs_readFile(). +
+Here is the call graph for this function:
+ + + + + +
@@ -479,6 +515,17 @@ References DT_DIR, DT_REG, fsfind(), kprintf(), MAXNAMLEN, memcpy(), name, and ROOTINO.
Referenced by ufs_openFile(). +
+Here is the call graph for this function:
+ + + + + + + + +
@@ -501,7 +548,34 @@
Definition at line 314 of file ufs.c.
-References kpanic(), NULL, ufs_initialize(), ufs_openFile(), ufs_readFile(), ufs_writeFile(), vfsRegisterFS(), and x1. +References kpanic(), NULL, ufs_initialize(), ufs_openFile(), ufs_readFile(), ufs_writeFile(), vfsRegisterFS(), and x1. +
+Here is the call graph for this function:
+ + + + + + + + + + + + + + + + + + + + + + + + +
@@ -561,6 +635,26 @@ References fileDescriptorStruct::dmadat, fsread(), fileDescriptorStruct::ino, kmalloc(), lookup(), fileDescriptorStruct::offset, fileDescriptorStruct::perms, and x1.
Referenced by ufs_init(). +
+Here is the call graph for this function:
+ + + + + + + + + + + + + + + + + +
@@ -608,6 +702,15 @@ References fsread(), and fileDescriptorStruct::ino.
Referenced by ufs_init(). +
+Here is the call graph for this function:
+ + + + + + +
@@ -655,6 +758,12 @@ References kprintf().
Referenced by ufs_init(). +
+Here is the call graph for this function:
+ + + +

Variable Documentation
@@ -677,7 +786,7 @@ Referenced by fsread().
-
Generated on Tue Dec 12 08:52:16 2006 for UbixOS V2 by +
Generated on Tue Dec 12 10:08:06 2006 for UbixOS V2 by 1.4.7
diff --git a/doc/html/ufs_8h-source.html b/doc/html/ufs_8h-source.html index 244e1a2..e902046 100644 --- a/doc/html/ufs_8h-source.html +++ b/doc/html/ufs_8h-source.html @@ -145,7 +145,7 @@ 00114 __uint16_t d_reclen; /* length of this record */ 00115 __uint8_t d_type; /* file type, see below */ 00116 __uint8_t d_namlen; /* length of string in d_name */ -00117 char d_name[MAXNAMLEN + 1]; /* name must be no longer than this */ +00117 char d_name[MAXNAMLEN + 1]; /* name must be no longer than this */ 00118 }; 00119 00120 #define NXADDR 2 /* External addresses in inode. */ @@ -172,9 +172,9 @@ 00141 u_int32_t di_kernflags; /* 84: Kernel flags. */ 00142 u_int32_t di_flags; /* 88: Status flags (chflags). */ 00143 int32_t di_extsize; /* 92: External attributes block. */ -00144 ufs2_daddr_t di_extb[NXADDR];/* 96: External attributes block. */ -00145 ufs2_daddr_t di_db[NDADDR]; /* 112: Direct disk blocks. */ -00146 ufs2_daddr_t di_ib[NIADDR]; /* 208: Indirect disk blocks. */ +00144 ufs2_daddr_t di_extb[NXADDR];/* 96: External attributes block. */ +00145 ufs2_daddr_t di_db[NDADDR]; /* 112: Direct disk blocks. */ +00146 ufs2_daddr_t di_ib[NIADDR]; /* 208: Indirect disk blocks. */ 00147 int64_t di_spare[3]; /* 232: Reserved; currently unused */ 00148 }; 00149 @@ -183,7 +183,7 @@ 00152 int16_t di_nlink; /* 2: File link count. */ 00153 union { 00154 u_int16_t oldids[2]; /* 4: Ffs: old user and group ids. */ -00155 } di_u; +00155 } di_u; 00156 u_int64_t di_size; /* 8: File byte count. */ 00157 int32_t di_atime; /* 16: Last access time. */ 00158 int32_t di_atimensec; /* 20: Last access time. */ @@ -191,8 +191,8 @@ 00160 int32_t di_mtimensec; /* 28: Last modified time. */ 00161 int32_t di_ctime; /* 32: Last inode change time. */ 00162 int32_t di_ctimensec; /* 36: Last inode change time. */ -00163 ufs1_daddr_t di_db[NDADDR]; /* 40: Direct disk blocks. */ -00164 ufs1_daddr_t di_ib[NIADDR]; /* 88: Indirect disk blocks. */ +00163 ufs1_daddr_t di_db[NDADDR]; /* 40: Direct disk blocks. */ +00164 ufs1_daddr_t di_ib[NIADDR]; /* 88: Indirect disk blocks. */ 00165 u_int32_t di_flags; /* 100: Status flags (chflags). */ 00166 int32_t di_blocks; /* 104: Blocks actually held. */ 00167 int32_t di_gen; /* 108: Generation number. */ @@ -278,13 +278,13 @@ 00247 int8_t fs_clean; /* filesystem is clean flag */ 00248 int8_t fs_ronly; /* mounted read-only flag */ 00249 int8_t fs_old_flags; /* old FS_ flags */ -00250 u_char fs_fsmnt[MAXMNTLEN]; /* name mounted on */ -00251 u_char fs_volname[MAXVOLLEN]; /* volume name */ +00250 u_char fs_fsmnt[MAXMNTLEN]; /* name mounted on */ +00251 u_char fs_volname[MAXVOLLEN]; /* volume name */ 00252 u_int64_t fs_swuid; /* system-wide uid */ 00253 int32_t fs_pad; /* due to alignment of fs_swuid */ 00254 /* these fields retain the current block allocation info */ 00255 int32_t fs_cgrotor; /* last cg searched */ -00256 void *fs_ocsp[NOCSPTRS]; /* padding; was list of fs_cs buffers */ +00256 void *fs_ocsp[NOCSPTRS]; /* padding; was list of fs_cs buffers */ 00257 u_int8_t *fs_contigdirs; /* (u) # of contig. allocated dirs */ 00258 struct csum *fs_csp; /* (u) cg summary info buffer */ 00259 int32_t *fs_maxcluster; /* (u) max cluster in each cyl group */ @@ -300,7 +300,7 @@ 00269 ufs2_daddr_t fs_csaddr; /* blk addr of cyl grp summary area */ 00270 int64_t fs_pendingblocks; /* (u) blocks being freed */ 00271 int32_t fs_pendinginodes; /* (u) inodes being freed */ -00272 int32_t fs_snapinum[FSMAXSNAP];/* list of snapshot inode numbers */ +00272 int32_t fs_snapinum[FSMAXSNAP];/* list of snapshot inode numbers */ 00273 int32_t fs_avgfilesize; /* expected average file size */ 00274 int32_t fs_avgfpdir; /* expected # of files per directory */ 00275 int32_t fs_save_cgsize; /* save real cg size to use fs_bsize */ @@ -330,7 +330,7 @@ 00299 END 00300 ***/ 00301 -
Generated on Tue Dec 12 08:52:05 2006 for UbixOS V2 by +
Generated on Tue Dec 12 09:59:41 2006 for UbixOS V2 by 1.4.7
diff --git a/doc/html/ufs_8h.html b/doc/html/ufs_8h.html index f39b280..05a5b5d 100644 --- a/doc/html/ufs_8h.html +++ b/doc/html/ufs_8h.html @@ -34,6 +34,28 @@ #include <sys/device.h>

+Include dependency graph for ufs.h:
+ + + + + + + + + + + +
+This graph shows which files directly or indirectly include this file:
+ + + + + + + +
Go to the source code of this file.

Defines
@@ -1068,7 +1090,34 @@
Definition at line 314 of file ufs.c.
-References kpanic(), NULL, ufs_initialize(), ufs_openFile(), ufs_readFile(), ufs_writeFile(), vfsRegisterFS(), and x1. +References kpanic(), NULL, ufs_initialize(), ufs_openFile(), ufs_readFile(), ufs_writeFile(), vfsRegisterFS(), and x1. +
+Here is the call graph for this function:
+ + + + + + + + + + + + + + + + + + + + + + + + +
@@ -1092,7 +1141,7 @@ Referenced by ufs_init().
-
Generated on Tue Dec 12 08:52:13 2006 for UbixOS V2 by +
Generated on Tue Dec 12 10:03:36 2006 for UbixOS V2 by 1.4.7
diff --git a/doc/html/uniondescriptorTableUnion.html b/doc/html/uniondescriptorTableUnion.html index f5da7d6..7d11500 100644 --- a/doc/html/uniondescriptorTableUnion.html +++ b/doc/html/uniondescriptorTableUnion.html @@ -30,7 +30,12 @@
descriptorTableUnion Union Reference
#include <gdt.h>
-

Data Structures
+Collaboration diagram for descriptorTableUnion:
Collaboration graph + + + + +[legend]
@@ -101,7 +106,7 @@

The documentation for this union was generated from the following file:

src/sys/include/sys/gdt.h
-
Generated on Tue Dec 12 08:52:17 2006 for UbixOS V2 by +
Generated on Tue Dec 12 10:08:54 2006 for UbixOS V2 by 1.4.7
diff --git a/doc/html/unionetheraddr.html b/doc/html/unionetheraddr.html index 6e3c484..5d23b4b 100644 --- a/doc/html/unionetheraddr.html +++ b/doc/html/unionetheraddr.html @@ -80,7 +80,7 @@

The documentation for this union was generated from the following file:

src/sys/include/isa/ne2k.h
-
Generated on Tue Dec 12 08:52:18 2006 for UbixOS V2 by +
Generated on Tue Dec 12 10:08:57 2006 for UbixOS V2 by 1.4.7
diff --git a/doc/html/unmappage_8c-source.html b/doc/html/unmappage_8c-source.html index b1f3223..ba71b25 100644 --- a/doc/html/unmappage_8c-source.html +++ b/doc/html/unmappage_8c-source.html @@ -172,7 +172,7 @@ 00141 00142 END 00143 ***/ -
Generated on Tue Dec 12 08:52:09 2006 for UbixOS V2 by +
Generated on Tue Dec 12 09:59:42 2006 for UbixOS V2 by 1.4.7
diff --git a/doc/html/unmappage_8c.html b/doc/html/unmappage_8c.html index 5dd397f..6303ae0 100644 --- a/doc/html/unmappage_8c.html +++ b/doc/html/unmappage_8c.html @@ -32,6 +32,14 @@
unmappage.c File Reference
#include <vmm/vmm.h>

+Include dependency graph for unmappage.c:
+ + + + + + +
Go to the source code of this file.

Data Fields

gdtDescriptor descriptor
@@ -109,7 +117,7 @@ References tablesBaseAddress.
-
Generated on Tue Dec 12 08:52:17 2006 for UbixOS V2 by +
Generated on Tue Dec 12 10:08:43 2006 for UbixOS V2 by 1.4.7
diff --git a/doc/html/vfs_8c-source.html b/doc/html/vfs_8c-source.html index 4222c9f..b9704c4 100644 --- a/doc/html/vfs_8c-source.html +++ b/doc/html/vfs_8c-source.html @@ -123,7 +123,7 @@ 00099 00100 /* Allocate Memory */ 00101 tmpFs = (struct fileSystem *)kmalloc(sizeof(struct fileSystem)); -00102 if (tmpFs == NULL) { +00102 if (tmpFs == NULL) { 00103 kprintf("vfsRegisterFS: memory allocation failed\n"); 00104 /* Memory Allocation Failed */ 00105 return(0x1); @@ -186,7 +186,7 @@ 00170 END 00171 ***/ 00172 -
Generated on Tue Dec 12 08:52:08 2006 for UbixOS V2 by +
Generated on Tue Dec 12 09:59:42 2006 for UbixOS V2 by 1.4.7
diff --git a/doc/html/vfs_8c.html b/doc/html/vfs_8c.html index feddc10..bc5dee5 100644 --- a/doc/html/vfs_8c.html +++ b/doc/html/vfs_8c.html @@ -37,6 +37,23 @@ #include <sys/kern_descrip.h>

+Include dependency graph for vfs.c:
+ + + + + + + + + + + + + + + +
Go to the source code of this file.

Functions
@@ -92,6 +109,30 @@ Definition at line 148 of file vfs.c.
References falloc(), file::fd, fopen(), open_args::path, file::path, strcpy, and thread::td_retval. +
+Here is the call graph for this function:
+ + + + + + + + + + + + + + + + + + + + + +
@@ -115,6 +156,12 @@ Definition at line 48 of file vfs.c.
References vitalsStruct::fileSystems, kprintf(), and systemVitals. +
+Here is the call graph for this function:
+ + + +
@@ -172,12 +219,28 @@
Definition at line 81 of file vfs.c.
-References vitalsStruct::fileSystems, kmalloc(), kprintf(), memcpy(), fileSystem::next, NULL, fileSystem::prev, systemVitals, vfsFindFS(), fileSystem::vfsType, and x1. +References vitalsStruct::fileSystems, kmalloc(), kprintf(), memcpy(), fileSystem::next, NULL, fileSystem::prev, systemVitals, vfsFindFS(), fileSystem::vfsType, and x1.
Referenced by devfs_init(), ubixfs_init(), and ufs_init(). +
+Here is the call graph for this function:
+ + + + + + + + + + + + + +
-
Generated on Tue Dec 12 08:52:17 2006 for UbixOS V2 by +
Generated on Tue Dec 12 10:08:23 2006 for UbixOS V2 by 1.4.7
diff --git a/doc/html/video_8c-source.html b/doc/html/video_8c-source.html index 1aab5c6..30f1b1c 100644 --- a/doc/html/video_8c-source.html +++ b/doc/html/video_8c-source.html @@ -96,7 +96,7 @@ 00065 unsigned int bufferOffset = 0x0, character = 0x0, i = 0x0; 00066 00067 /* Short circuit if we're in tty mode */ -00068 if (NULL != tty_foreground) +00068 if (NULL != tty_foreground) 00069 { 00070 tty_print(string,tty_find(0)); 00071 return; @@ -159,7 +159,7 @@ 00128 /*** 00129 END 00130 ***/ -
Generated on Tue Dec 12 08:52:08 2006 for UbixOS V2 by +
Generated on Tue Dec 12 09:59:42 2006 for UbixOS V2 by 1.4.7
diff --git a/doc/html/video_8c.html b/doc/html/video_8c.html index ef0356b..07007d8 100644 --- a/doc/html/video_8c.html +++ b/doc/html/video_8c.html @@ -36,6 +36,17 @@ #include <ubixos/tty.h>

+Include dependency graph for video.c:
+ + + + + + + + + +
Go to the source code of this file.

Functions
@@ -75,6 +86,13 @@ References inportByte(), outportByte(), printColor, tty_foreground, tty_termNode::tty_x, tty_termNode::tty_y, and videoBuffer.
Referenced by keyboardHandler(). +
+Here is the call graph for this function:
+ + + + +
@@ -100,6 +118,12 @@ References defaultColor, outportByte(), videoBuffer, and x20.
Referenced by kmain(). +
+Here is the call graph for this function:
+ + + +
@@ -123,9 +147,25 @@
Definition at line 62 of file video.c.
-References inportByte(), NULL, outportByte(), printColor, tty_find(), tty_foreground, tty_print(), videoBuffer, and x20. +References inportByte(), NULL, outportByte(), printColor, tty_find(), tty_foreground, tty_print(), videoBuffer, and x20.
Referenced by fdcRw(), kmain(), and kprintf(). +
+Here is the call graph for this function:
+ + + + + + + + + + + + + +

Variable Documentation
@@ -165,7 +205,7 @@ Definition at line 36 of file video.c.
-
Generated on Tue Dec 12 08:52:16 2006 for UbixOS V2 by +
Generated on Tue Dec 12 10:07:37 2006 for UbixOS V2 by 1.4.7
diff --git a/doc/html/video_8h-source.html b/doc/html/video_8h-source.html index 5662ef7..a425a36 100644 --- a/doc/html/video_8h-source.html +++ b/doc/html/video_8h-source.html @@ -90,7 +90,7 @@ 00059 00060 END 00061 ***/ -
Generated on Tue Dec 12 08:52:05 2006 for UbixOS V2 by +
Generated on Tue Dec 12 09:59:41 2006 for UbixOS V2 by 1.4.7
diff --git a/doc/html/video_8h.html b/doc/html/video_8h.html index 90070b9..e2ba1af 100644 --- a/doc/html/video_8h.html +++ b/doc/html/video_8h.html @@ -32,6 +32,29 @@
video.h File Reference
#include <ubixos/types.h>

+Include dependency graph for video.h:
+ + + + + +
+This graph shows which files directly or indirectly include this file:
+ + + + + + + + + + + + + + +
Go to the source code of this file.

Functions
@@ -92,6 +115,13 @@ References inportByte(), outportByte(), printColor, tty_foreground, tty_termNode::tty_x, tty_termNode::tty_y, and videoBuffer.
Referenced by keyboardHandler(). +
+Here is the call graph for this function:
+ + + + +
@@ -117,6 +147,12 @@ References defaultColor, outportByte(), videoBuffer, and x20.
Referenced by kmain(). +
+Here is the call graph for this function:
+ + + +
@@ -140,9 +176,25 @@
Definition at line 62 of file video.c.
-References inportByte(), NULL, outportByte(), printColor, tty_find(), tty_foreground, tty_print(), videoBuffer, and x20. +References inportByte(), NULL, outportByte(), printColor, tty_find(), tty_foreground, tty_print(), videoBuffer, and x20.
Referenced by fdcRw(), kmain(), and kprintf(). +
+Here is the call graph for this function:
+ + + + + + + + + + + + + +

Variable Documentation
@@ -165,7 +217,7 @@ Referenced by backSpace(), and kprint().
-
Generated on Tue Dec 12 08:52:11 2006 for UbixOS V2 by +
Generated on Tue Dec 12 10:01:59 2006 for UbixOS V2 by 1.4.7
diff --git a/doc/html/vitals_8c-source.html b/doc/html/vitals_8c-source.html index 48283a3..5c96400 100644 --- a/doc/html/vitals_8c-source.html +++ b/doc/html/vitals_8c-source.html @@ -103,7 +103,7 @@ 00072 END 00073 ***/ 00074 -
Generated on Tue Dec 12 08:52:06 2006 for UbixOS V2 by +
Generated on Tue Dec 12 09:59:42 2006 for UbixOS V2 by 1.4.7
diff --git a/doc/html/vitals_8c.html b/doc/html/vitals_8c.html index 9dd0aa2..9ff5720 100644 --- a/doc/html/vitals_8c.html +++ b/doc/html/vitals_8c.html @@ -36,6 +36,20 @@ #include <string.h>

+Include dependency graph for vitals.c:
+ + + + + + + + + + + + +
Go to the source code of this file.

Defines
@@ -67,6 +81,20 @@ Definition at line 48 of file vitals.c.
References vitalsStruct::dQuantum, kmalloc(), kpanic(), kprintf(), memset(), vitalsStruct::quantum, and systemVitals. +
+Here is the call graph for this function:
+ + + + + + + + + + + +

Variable Documentation
@@ -89,7 +117,7 @@ Referenced by adjustCowCounter(), fclose(), fopen(), freePage(), keyboardHandler(), kmain(), ogPrintf(), sysGetTime(), sysGetUptime(), systemTask(), time_init(), ubthread_cond_timedwait(), vfs_addMount(), vfs_findMount(), vfs_init(), vfsFindFS(), vfsRegisterFS(), vitals_init(), vmmFindFreePage(), and vmmFreeProcessPages().
-
Generated on Tue Dec 12 08:52:15 2006 for UbixOS V2 by +
Generated on Tue Dec 12 10:06:16 2006 for UbixOS V2 by 1.4.7
diff --git a/doc/html/vitals_8h-source.html b/doc/html/vitals_8h-source.html index a25cf13..ca99e48 100644 --- a/doc/html/vitals_8h-source.html +++ b/doc/html/vitals_8h-source.html @@ -122,7 +122,7 @@ 00091 Cleaned up 00092 END 00093 ***/ -
Generated on Tue Dec 12 08:52:05 2006 for UbixOS V2 by +
Generated on Tue Dec 12 09:59:41 2006 for UbixOS V2 by 1.4.7
diff --git a/doc/html/vitals_8h.html b/doc/html/vitals_8h.html index 940c2e0..9b6c8d5 100644 --- a/doc/html/vitals_8h.html +++ b/doc/html/vitals_8h.html @@ -35,6 +35,36 @@ #include <vfs/vfs.h>

+Include dependency graph for vitals.h:
+ + + + + + + +
+This graph shows which files directly or indirectly include this file:
+ + + + + + + + + + + + + + + + + + + +
Go to the source code of this file.

Functions
@@ -88,6 +118,20 @@ Definition at line 48 of file vitals.c.
References vitalsStruct::dQuantum, kmalloc(), kpanic(), kprintf(), memset(), vitalsStruct::quantum, and systemVitals. +
+Here is the call graph for this function:
+ + + + + + + + + + + +

Variable Documentation
@@ -110,7 +154,7 @@ Referenced by adjustCowCounter(), fclose(), fopen(), freePage(), keyboardHandler(), kmain(), ogPrintf(), sysGetTime(), sysGetUptime(), systemTask(), time_init(), ubthread_cond_timedwait(), vfs_addMount(), vfs_findMount(), vfs_init(), vfsFindFS(), vfsRegisterFS(), vitals_init(), vmmFindFreePage(), and vmmFreeProcessPages().
-
Generated on Tue Dec 12 08:52:13 2006 for UbixOS V2 by +
Generated on Tue Dec 12 10:03:30 2006 for UbixOS V2 by 1.4.7
diff --git a/doc/html/vmm_8h-source.html b/doc/html/vmm_8h-source.html index f9150bd..017b99b 100644 --- a/doc/html/vmm_8h-source.html +++ b/doc/html/vmm_8h-source.html @@ -119,7 +119,7 @@ 00088 00089 END 00090 ***/ -
Generated on Tue Dec 12 08:52:05 2006 for UbixOS V2 by +
Generated on Tue Dec 12 09:59:41 2006 for UbixOS V2 by 1.4.7
diff --git a/doc/html/vmm_8h.html b/doc/html/vmm_8h.html index 125b013..3f07d13 100644 --- a/doc/html/vmm_8h.html +++ b/doc/html/vmm_8h.html @@ -33,6 +33,43 @@ #include <ubixos/types.h>

+Include dependency graph for vmm.h:
+ + + + + + + +
+This graph shows which files directly or indirectly include this file:
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
Go to the source code of this file.

Data Structures
@@ -179,6 +216,18 @@ References assert, mMap::cowCounter, freePages, vitalsStruct::freePages, memAvail, mMap::pid, spinLock(), spinUnlock(), mMap::status, systemVitals, vmmCowSpinLock, vmmID, and vmmMemoryMap.
Referenced by freePage(), vmm_pageFault(), vmmCopyVirtualSpace(), and vmmFreeProcessPages(). +
+Here is the call graph for this function:
+ + + + + + + + + +
@@ -204,6 +253,13 @@ References cr0, inportByte(), and outportByte().
Referenced by vmmMemMapInit(). +
+Here is the call graph for this function:
+ + + + +
@@ -230,6 +286,19 @@ References adjustCowCounter(), assert, mMap::cowCounter, freePages, vitalsStruct::freePages, memAvail, mMap::pid, spinLock(), spinUnlock(), mMap::status, systemVitals, vmmMemoryMap, and vmmSpinLock.
Referenced by vmm_remapPage(). +
+Here is the call graph for this function:
+ + + + + + + + + + +
@@ -255,6 +324,27 @@ Definition at line 41 of file vmm_init.c.
References K_PANIC, vmm_pagingInit(), and vmmMemMapInit(). +
+Here is the call graph for this function:
+ + + + + + + + + + + + + + + + + + +
@@ -281,6 +371,24 @@ References freePages, vitalsStruct::freePages, kpanic(), memAvail, memNotavail, numPages, mMap::pid, spinLock(), spinUnlock(), status, sysID, systemVitals, vmmMemoryMap, and vmmSpinLock.
Referenced by execFile(), kmod_load(), ldEnable(), obreak(), sysExec(), vmm_getFreeMallocPage(), vmm_pageFault(), vmm_pagingInit(), vmm_remapPage(), vmmGetFreeKernelPage(), vmmGetFreePage(), and vmmGetFreeVirtualPage(). +
+Here is the call graph for this function:
+ + + + + + + + + + + + + + + +
@@ -307,6 +415,19 @@ References adjustCowCounter(), mMap::cowCounter, freePages, vitalsStruct::freePages, memAvail, numPages, PAGE_COW, pageEntries, parentPageDirAddr, mMap::pid, spinLock(), spinUnlock(), status, systemVitals, tablesBaseAddress, vmmID, vmmMemoryMap, vmmSpinLock, and x1000.
Referenced by systemTask(). +
+Here is the call graph for this function:
+ + + + + + + + + + +
@@ -332,6 +453,15 @@ References countMemory(), freePages, kprintf(), memAvail, memNotavail, numPages, mMap::pageAddr, mMap::pid, mMap::status, status, vmmID, vmmMemoryMap, and x1000.
Referenced by vmm_init(). +
+Here is the call graph for this function:
+ + + + + + +

Variable Documentation
@@ -373,7 +503,7 @@ Referenced by adjustCowCounter(), freePage(), kmain(), vmm_pagingInit(), vmmFindFreePage(), vmmFreeProcessPages(), and vmmMemMapInit().
-
Generated on Tue Dec 12 08:52:14 2006 for UbixOS V2 by +
Generated on Tue Dec 12 10:04:13 2006 for UbixOS V2 by 1.4.7
diff --git a/doc/html/vmm__init_8c-source.html b/doc/html/vmm__init_8c-source.html index 65af7bc..ccdb48a 100644 --- a/doc/html/vmm__init_8c-source.html +++ b/doc/html/vmm__init_8c-source.html @@ -75,7 +75,7 @@ 00052 END 00053 ***/ 00054 -
Generated on Tue Dec 12 08:52:09 2006 for UbixOS V2 by +
Generated on Tue Dec 12 09:59:42 2006 for UbixOS V2 by 1.4.7
diff --git a/doc/html/vmm__init_8c.html b/doc/html/vmm__init_8c.html index b7f4f23..618f7c3 100644 --- a/doc/html/vmm__init_8c.html +++ b/doc/html/vmm__init_8c.html @@ -33,6 +33,15 @@ #include <ubixos/kpanic.h>

+Include dependency graph for vmm_init.c:
+ + + + + + + +
Go to the source code of this file.

Data Structures
@@ -63,9 +72,30 @@ Definition at line 41 of file vmm_init.c.
References K_PANIC, vmm_pagingInit(), and vmmMemMapInit(). +
+Here is the call graph for this function:
+ + + + + + + + + + + + + + + + + + +
-
Generated on Tue Dec 12 08:52:17 2006 for UbixOS V2 by +
Generated on Tue Dec 12 10:08:45 2006 for UbixOS V2 by 1.4.7
diff --git a/doc/html/vmm__memory_8c-source.html b/doc/html/vmm__memory_8c-source.html index f9daf01..9479776 100644 --- a/doc/html/vmm__memory_8c-source.html +++ b/doc/html/vmm__memory_8c-source.html @@ -445,7 +445,7 @@ 00414 00415 END 00416 ***/ -
Generated on Tue Dec 12 08:52:09 2006 for UbixOS V2 by +
Generated on Tue Dec 12 09:59:42 2006 for UbixOS V2 by 1.4.7
diff --git a/doc/html/vmm__memory_8c.html b/doc/html/vmm__memory_8c.html index 956a0dc..841d10a 100644 --- a/doc/html/vmm__memory_8c.html +++ b/doc/html/vmm__memory_8c.html @@ -39,6 +39,24 @@ #include <assert.h>

+Include dependency graph for vmm_memory.c:
+ + + + + + + + + + + + + + + + +
Go to the source code of this file.

Functions
@@ -100,6 +118,18 @@ References assert, mMap::cowCounter, vitalsStruct::freePages, freePages, memAvail, mMap::pid, spinLock(), spinUnlock(), mMap::status, systemVitals, vmmCowSpinLock, vmmID, and vmmMemoryMap.
Referenced by freePage(), vmm_pageFault(), vmmCopyVirtualSpace(), and vmmFreeProcessPages(). +
+Here is the call graph for this function:
+ + + + + + + + + +
@@ -125,6 +155,13 @@ References cr0, inportByte(), and outportByte().
Referenced by vmmMemMapInit(). +
+Here is the call graph for this function:
+ + + + +
@@ -151,6 +188,19 @@ References adjustCowCounter(), assert, mMap::cowCounter, vitalsStruct::freePages, freePages, memAvail, mMap::pid, spinLock(), spinUnlock(), mMap::status, systemVitals, vmmMemoryMap, and vmmSpinLock.
Referenced by vmm_remapPage(). +
+Here is the call graph for this function:
+ + + + + + + + + + +
@@ -177,6 +227,24 @@ References vitalsStruct::freePages, freePages, kpanic(), memAvail, memNotavail, numPages, mMap::pid, spinLock(), spinUnlock(), status, sysID, systemVitals, vmmMemoryMap, and vmmSpinLock.
Referenced by execFile(), kmod_load(), ldEnable(), obreak(), sysExec(), vmm_getFreeMallocPage(), vmm_pageFault(), vmm_pagingInit(), vmm_remapPage(), vmmGetFreeKernelPage(), vmmGetFreePage(), and vmmGetFreeVirtualPage(). +
+Here is the call graph for this function:
+ + + + + + + + + + + + + + + +
@@ -203,6 +271,19 @@ References adjustCowCounter(), mMap::cowCounter, vitalsStruct::freePages, freePages, memAvail, numPages, PAGE_COW, pageEntries, parentPageDirAddr, mMap::pid, spinLock(), spinUnlock(), status, systemVitals, tablesBaseAddress, vmmID, vmmMemoryMap, vmmSpinLock, and x1000.
Referenced by systemTask(). +
+Here is the call graph for this function:
+ + + + + + + + + + +
@@ -228,6 +309,15 @@ References countMemory(), freePages, kprintf(), memAvail, memNotavail, numPages, mMap::pageAddr, mMap::pid, status, mMap::status, vmmID, vmmMemoryMap, and x1000.
Referenced by vmm_init(). +
+Here is the call graph for this function:
+ + + + + + +

Variable Documentation
@@ -326,7 +416,7 @@ Referenced by freePage(), vmmFindFreePage(), and vmmFreeProcessPages().
-
Generated on Tue Dec 12 08:52:17 2006 for UbixOS V2 by +
Generated on Tue Dec 12 10:08:52 2006 for UbixOS V2 by 1.4.7
diff --git a/doc/html/vsprintf_8c-source.html b/doc/html/vsprintf_8c-source.html index 8cc3593..b320b6f 100644 --- a/doc/html/vsprintf_8c-source.html +++ b/doc/html/vsprintf_8c-source.html @@ -314,7 +314,7 @@ 00283 END 00284 ***/ 00285 -
Generated on Tue Dec 12 08:52:07 2006 for UbixOS V2 by +
Generated on Tue Dec 12 09:59:42 2006 for UbixOS V2 by 1.4.7
diff --git a/doc/html/vsprintf_8c.html b/doc/html/vsprintf_8c.html index b7ac5c8..88c0507 100644 --- a/doc/html/vsprintf_8c.html +++ b/doc/html/vsprintf_8c.html @@ -33,6 +33,15 @@ #include <lib/string.h>

+Include dependency graph for vsprintf.c:
+ + + + + + + +
Go to the source code of this file.

Functions
@@ -376,9 +385,16 @@ References is_digit, LEFT, number(), PLUS, SIGN, skip_atoi(), SMALL, SPACE, SPECIAL, strlen, vaArg, and ZEROPAD.
Referenced by kpanic(), kprintf(), and sprintf(). +
+Here is the call graph for this function:
+ + + + +
-
Generated on Tue Dec 12 08:52:15 2006 for UbixOS V2 by +
Generated on Tue Dec 12 10:06:46 2006 for UbixOS V2 by 1.4.7
diff --git a/doc/xml/8259_8c.xml b/doc/xml/8259_8c.xml index 3777b23..35ce12e 100644 --- a/doc/xml/8259_8c.xml +++ b/doc/xml/8259_8c.xml @@ -2,47 +2,44 @@ 8259.c - sys/io.h isa/8259.h - ubixos/types.h + sys/io.h lib/kprintf.h - + ubixos/types.h - + - + sys/_types.h - + lib/kprintf.h - + - + src/sys/isa/8259.c - + - + - - - + - + sys/io.h - + isa/8259.h - + @@ -53,12 +50,12 @@ () i8259_init - +initialize the 8259 PIC - +This will initialize both PICs for all of our IRQs - + icw1 icw4 kprintf @@ -70,57 +67,63 @@ sPic sVec - + void void irqDisable - (uInt16 irqNo) + (u_int16_t irqNo) irqDisable - uInt16 + u_int16_t irqNo - +disable specified IRQ - + + +irqNo + + +IRQ to disable + + + - - irqMask + + irqMask mPic outportByte sPic - _int13 - kpanic - ne2kHandler - + void void irqEnable - (uInt16 irqNo) + (u_int16_t irqNo) irqEnable - uInt16 + u_int16_t irqNo - +enable specified IRQ - + + +irqNo + + +IRQ to enable + + + - - irqMask + + irqMask mPic outportByte sPic - _int13 - atkbd_init - fdc_init - kmain - mouseInit - ne2k_init - ne2kHandler @@ -136,9 +139,9 @@ - - irqDisable - irqEnable + + irqDisable + irqEnable @@ -175,105 +178,53 @@ *****************************************************************************************/ -#include<sys/io.h> -#include<isa/8259.h> -#include<ubixos/types.h> -#include<lib/kprintf.h> - -staticunsignedintirqMask=0xFFFF; - -/************************************************************************ - -Function:int8259_init() - -Description:ThisfunctionwillinitializebothPICsforallofourIRQs - -Notes: - -************************************************************************/ -inti8259_init(){ -outportByte(mPic,icw1);/*InitializeMasterPIC*/ -outportByte(sPic,icw1);/*InitializeSeconaryPIC*/ -outportByte(mPic+1,mVec);/*MasterInterrupVector*/ -outportByte(sPic+1,sVec);/*SecondaryInterruptVector*/ -outportByte(mPic+1,1<<2);/*BitmaskforcascadeonIRQ2*/ -outportByte(sPic+1,2);/*CascadeonIRQ2*/ -outportByte(mPic+1,icw4);/*FinishPrimaryInitialization*/ -outportByte(sPic+1,icw4);/*FinishSeconaryInitialization*/ -outportByte(mImr,0xff);/*MaskAllPrimaryInterrupts*/ -outportByte(sImr,0xff);/*MaskAllSeconaryInterrupts*/ +#include<isa/8259.h> +#include<sys/io.h> +#include<lib/kprintf.h> + +staticunsignedintirqMask=0xFFFF; + +inti8259_init(){ +outportByte(mPic,icw1);/*InitializeMasterPIC*/ +outportByte(sPic,icw1);/*InitializeSeconaryPIC*/ +outportByte(mPic+1,mVec);/*MasterInterrupVector*/ +outportByte(sPic+1,sVec);/*SecondaryInterruptVector*/ +outportByte(mPic+1,1<<2);/*BitmaskforcascadeonIRQ2*/ +outportByte(sPic+1,2);/*CascadeonIRQ2*/ +outportByte(mPic+1,icw4);/*FinishPrimaryInitialization*/ +outportByte(sPic+1,icw4);/*FinishSeconaryInitialization*/ +outportByte(mImr,0xff);/*MaskAllPrimaryInterrupts*/ +outportByte(sImr,0xff);/*MaskAllSeconaryInterrupts*/ + +/*Printoutthesysteminfoforthis*/ +kprintf("pic0-Port:[0x%X]\n",mPic); +kprintf("pic1-Port:[0x%X]\n",sPic); -/*Printoutthesysteminfoforthis*/ -kprintf("pic0-Port:[0x%X]\n",mPic); -kprintf("pic1-Port:[0x%X]\n",sPic); +/*Returnsothesystemknowsitwentwell*/ +return(0x0); +} -/*Returnsothesystemknowsitwentwell*/ -return(0x0); -} - -/************************************************************************ - -Function:intirqEnable() - -Description:ThisfunctionisusedtoturnonanIRQ - -Notes: - -************************************************************************/ -voidirqEnable(uInt16irqNo){ -irqMask&=~(1<<irqNo); -if(irqNo>=8){ -irqMask&=~(1<<2); -} -outportByte(mPic+1,irqMask&0xFF); -outportByte(sPic+1,(irqMask>>8)&0xFF); -} - -/************************************************************************ - -Function:intirqDisable() - -Description:ThisfunctionisusedtoturnoffanIRQ - -Notes: - -************************************************************************/ -voidirqDisable(uInt16irqNo){ -irqMask|=(1<<irqNo); -if((irqMask&0xFF00)==0xFF00){ -irqMask|=(1<<2); -} -outportByte(mPic+1,irqMask&0xFF); -outportByte(sPic+1,(irqMask>>8)&0xFF); -} - -/*** -$Log$ -Revision1.1.1.12006/06/0112:46:12reddawg -ubix2 - -Revision1.22005/10/1200:13:37reddawg -Removed - -Revision1.1.1.12005/09/2617:23:59reddawg -nomessage - -Revision1.52004/07/0913:20:08reddawg -Ohyeahduhyoucannotnamefunctionswithnumbers - -Revision1.42004/07/0913:14:29reddawg -8259:changedinit8259to8259_init -AdjustedStartupRoutines - -Revision1.32004/05/2022:51:09reddawg -CleanedUpWarnings - -Revision1.22004/05/1002:23:24reddawg -MinorChangesToSourceCodeToPrepareItForOpenSourceRelease - -END -***/ - +voidirqEnable(u_int16_tirqNo){ +irqMask&=~(1<<irqNo); +if(irqNo>=8){ +irqMask&=~(1<<2); +} +outportByte(mPic+1,irqMask&0xFF); +outportByte(sPic+1,(irqMask>>8)&0xFF); +} + +voidirqDisable(u_int16_tirqNo){ +irqMask|=(1<<irqNo); +if((irqMask&0xFF00)==0xFF00){ +irqMask|=(1<<2); +} +outportByte(mPic+1,irqMask&0xFF); +outportByte(sPic+1,(irqMask>>8)&0xFF); +} + +/*** +END +***/ diff --git a/doc/xml/8259_8h.xml b/doc/xml/8259_8h.xml index b9f786d..2b8f1cf 100644 --- a/doc/xml/8259_8h.xml +++ b/doc/xml/8259_8h.xml @@ -3,7 +3,7 @@ 8259.h ubixos/types.h - src/sys/include/ubixos/init.h + src/sys/include/ubixos/init.h src/sys/isa/8259.c src/sys/isa/atkbd.c src/sys/isa/fdc.c @@ -15,97 +15,97 @@ src/sys/pci/lnc.c src/sys/sys/idt.c - + ubixos/types.h - + - + sys/_types.h - + src/sys/include/isa/8259.h - + - + src/sys/pci/lnc.c - + src/sys/kernel/sched.c - + src/sys/init/main.c - + src/sys/isa/ne2k.c - + src/sys/isa/atkbd.c - + src/sys/include/ubixos/init.h - - + + - + src/sys/kernel/kpanic.c - + src/sys/isa/8259.c - + src/sys/kernel/endtask.c - + src/sys/sys/idt.c - + src/sys/include/isa/8259.h - + - + - + - + - + - + - + - + - + - + - + - + src/sys/isa/fdc.c - + src/sys/isa/mouse.c @@ -135,7 +135,7 @@ - i8259_init + i8259_init icw4 @@ -147,7 +147,7 @@ - i8259_init + i8259_init mImr @@ -159,7 +159,7 @@ - i8259_init + i8259_init mPic @@ -171,9 +171,9 @@ - i8259_init - irqDisable - irqEnable + i8259_init + irqDisable + irqEnable mouseHandler mouseInit ne2kHandler @@ -190,7 +190,7 @@ atkbd_init fdc_init - i8259_init + i8259_init initLNC mouseInit ne2k_init @@ -227,7 +227,7 @@ - i8259_init + i8259_init sPic @@ -239,9 +239,9 @@ - i8259_init - irqDisable - irqEnable + i8259_init + irqDisable + irqEnable mouseHandler mouseInit ne2kHandler @@ -256,7 +256,7 @@ - i8259_init + i8259_init @@ -266,12 +266,12 @@ () i8259_init - +initialize the 8259 PIC - +This will initialize both PICs for all of our IRQs - + icw1 icw4 kprintf @@ -298,11 +298,7 @@ - - irqMask - mPic - outportByte - sPic + _int13 kpanic ne2kHandler @@ -322,11 +318,7 @@ - - irqMask - mPic - outportByte - sPic + _int13 atkbd_init fdc_init diff --git a/doc/xml/__types_8h.xml b/doc/xml/__types_8h.xml index 33d5788..851f392 100644 --- a/doc/xml/__types_8h.xml +++ b/doc/xml/__types_8h.xml @@ -5,1909 +5,1567 @@ src/sys/include/ubixos/times.h src/sys/include/ubixos/types.h - + src/sys/ufs/ffs.c - - src/sys/net/net/udpecho.c - - - + src/sys/include/ufs/ufs.h - + - + - + - + src/sys/include/sys/thread.h - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + src/sys/lib/string.c - - src/sys/include/net/ipv4/ip.h - - - - - - - - - - - - - - - - - - - + src/sys/include/lib/libcpp.h - + - + src/sys/pci/lnc.c - + src/sys/lib/kprintf.c - + src/sys/lib/memcpy.c - - src/sys/include/net/stats.h - - - - - - - - - + src/sys/include/pci/pci.h - + - + - + src/sys/lib/divdi3.c - + src/sys/include/ubixos/sched.h - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - + - + src/sys/pci/hd.c - + src/sys/lib/net.c - - src/sys/net/netif/tcpdump.c - - - - src/sys/include/net/netif.h - - - - - - - - - - - - - + src/sys/include/pci/lnc.h - + - - src/sys/net/netif/loopif.c - - - + src/sys/pci/pci.c - + src/sys/include/ufs/ffs.h - + - + - + src/sys/lib/strtok.c - + src/sys/include/ubixos/spinlock.h - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + - + src/sys/include/ubixos/endtask.h - + - + - + - + - + - + - + - + - - - + - + src/sys/include/lib/bioscall.h - + - + - + src/sys/include/ubixos/smp.h - + - + src/sys/include/sys/device.old.h - + - - - + - - src/sys/net/net/sys_arch.c - - - + src/sys/include/sys/dma.h - + - + - + src/sys/kernel/vitals.c - + src/sys/include/isa/ne2k.h - + - - - + - + src/sys/kernel/elf.c - + src/sys/kernel/tty.c - - src/sys/include/net/udp.h - - - - - - - - - - - + src/sys/include/devfs/devfs.h - + - + - + - + - + src/sys/mpi/message.c - + src/sys/kmods/kmod.c - + src/sys/mpi/system.c - + src/sys/include/ubixos/syscall.h - + - + - + src/sys/kernel/kern_sysctl.c - - src/sys/include/netif/arp.h - - - - - - - + src/sys/lib/atan.c - + src/sys/include/ubixos/vitals.h - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + src/sys/kernel/pipe.c - + src/sys/lib/kmalloc.c - + src/sys/vmm/paging.c - + src/sys/ubixfs/directory.c - + src/sys/ufs/ufs.c - + src/sys/kernel/kern_sig.c - - src/sys/include/net/tcp.h - - - - - - - - - - - - - + src/sys/include/ubixos/systemtask.h - + - + - + src/sys/kernel/ubthread.c - + src/sys/include/ubixos/types.h - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - src/sys/include/net/net.h - - - - - + src/sys/include/sys/_types.h - + - + - + src/sys/kernel/systemtask.c - + src/sys/include/sys/video.h - + - + - + - + - + - + - + - + - + - + - + - - src/sys/net/netif/ethernetif.c - - - - src/sys/net/netif/arp.c - - - - src/sys/include/net/ipv4/icmp.h - - - - - + src/sys/include/math.h - + - + - + src/sys/include/lib/string.h - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + src/sys/sys/dma.c - + src/sys/lib/ogprintf.cc - + src/sys/include/vmm/paging.h - + - + - - src/sys/net/net/bot.c - - - + src/sys/lib/strtol.c - + src/sys/include/sys/driver.h - + src/sys/include/string.h - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + - + src/sys/include/ubixos/time.h - + - + - + - + - + - + src/sys/include/vfs/file.h - + - + - + - + - + - + - + - + - - - + - + src/sys/include/sys/pipe.h - + - + src/sys/kernel/ld.c - + src/sys/kernel/fork.c - + src/sys/include/sys/tss.h - + - + - + - - src/sys/net/api/err.c - - - + src/sys/vmm/createvirtualspace.c - + src/sys/vmm/vmm_init.c - + src/sys/include/lib/kmalloc.h - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - + - + src/sys/init/static.c - - src/sys/net/api/tcpip.c - - - + src/sys/ubixfs/block.c - + src/sys/include/sys/kern_sysctl.h - + - + - + - - src/sys/include/net/tcpip.h - - - - - - - - - - src/sys/include/net/api_msg.h - - - - - - - - - - src/sys/include/netif/ethernetif.h - - - - - + src/sys/include/vmm/vmm.h - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + src/sys/include/lib/kprint.h - + - + src/sys/kernel/sched.c - + src/sys/isa/pit.c - - src/sys/net/net/shell.c - - - - src/sys/net/api/api_lib.c - - - + src/sys/vmm/setpageattributes.c - + src/sys/include/sys/gen_calls.h - + - + src/sys/include/mpi/mpi.h - + - + - + - + - + - + src/sys/vmm/getphysicaladdr.c - + src/sys/include/ubixos/fork.h - - - + - + src/sys/ubixfs/dirCache.c - + src/sys/ubixfs/ubixfs.c - + src/sys/include/sys/idt.h - + - + - + - + - + - + - + - + - - src/sys/include/net/mem.h - - - - - - - - - - - - - - - - src/sys/net/net/init.c - - - - src/sys/include/net/memp.h - - - - - - - - - - - - - + src/sys/include/vfs/vfs.h - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + - + src/sys/include/vfs/mount.h - + - + - + - + - + - + - + - + - + src/sys/include/lib/kprintf.h - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - + - + src/sys/include/ubixos/ld.h - + - + - + src/sys/sys/video.c - + src/sys/lib/memset.c - + src/sys/lib/assert.c - + src/sys/include/ubixos/kmod.h - + - + src/sys/init/main.c - + src/sys/include/ubixfs/ubixfs.h - + - + - + - + - + - + - + - + - + src/sys/kernel/bioscall.c - + src/sys/include/sys/kern_descrip.h - + - + - + - + - + - - src/sys/include/net/arch/perf.h - - - - src/sys/include/net/err.h - - - - - - - - - - - - - - - + src/sys/sys/device.c - + src/sys/include/ubixos/ubthread.h - + - - - + - + src/sys/include/sys/cdefs.h - + - + src/sys/kernel/syscall.c - - src/sys/include/net/api.h - - - - - - - - - - - - - - - + src/sys/include/ubixos/times.h - - - + src/sys/include/ubixfs/dirCache.h - + - + - + - + - + src/sys/include/sys/kern_sig.h - + - + src/sys/include/sde/sde.h - + - - src/sys/include/netif/loopif.h - - - - - - - + src/sys/isa/ne2k.c - + src/sys/lib/bcopy.c - + - + src/sys/include/ubixos/exec.h - + - + - + - + - + - - - - - + - + src/sys/include/ubixos/syscalls.h - + - + src/sys/include/pci/hd.h - + - + - - src/sys/include/net/sockets.h - - - - - - - + src/sys/isa/atkbd.c - + src/sys/vmm/pagefault.c - + src/sys/ubixfs/thread.c - + src/sys/include/ubixos/init.h - - + + - + src/sys/vfs/mount.c - + src/sys/include/isa/fdc.h - + - + - + src/sys/devfs/devfs.c - + src/sys/include/sys/sysproto.h - + - + - + - + - + - + - + - + - + - + - + - + - + src/sys/kernel/kpanic.c - + src/sys/vmm/unmappage.c - + src/sys/isa/8259.c - + src/sys/kernel/smp.c - + src/sys/kernel/time.c - + src/sys/lib/vsprintf.c - + src/sys/vmm/vmm_memory.c - + src/sys/include/ubixos/elf.h - + - + - + - + - + - + src/sys/kernel/spinlock.c - + src/sys/include/sys/signal.h - + - + src/sys/kernel/kern_descrip.c - + src/sys/kernel/endtask.c - + src/sys/lib/libcpp.cc - + src/sys/include/ubixos/tty.h - + - + - + - + - + - + - + - + - - src/sys/net/api/sockets.c - - - - src/sys/net/api/api_msg.c - - - + src/sys/vfs/file.c - + src/sys/vmm/getfreepage.c - + src/sys/kernel/gen_calls.c - + src/sys/sys/idt.c - + src/sys/kernel/syscall_new.c - + src/sys/kernel/exec.c - + src/sys/include/isa/8259.h - + - + - + - + - + - + - + - + - + - + - + - + src/sys/include/ubixos/syscalls_new.h - + - + src/sys/include/sys/buf.h - + - + src/sys/isa/fdc.c - + src/sys/vmm/getfreevirtualpage.c - + src/sys/isa/mouse.c - + src/sys/include/sys/device.h - + - + - + - + - + - + - + - + - + - + src/sys/vmm/copyvirtualspace.c - + src/sys/vfs/vfs.c diff --git a/doc/xml/arp_8h.xml b/doc/xml/arp_8h.xml index 2d40149..599c3ad 100644 --- a/doc/xml/arp_8h.xml +++ b/doc/xml/arp_8h.xml @@ -2,131 +2,30 @@ arp.h - net/pbuf.h - net/ipv4/ip_addr.h - net/netif.h - src/sys/net/netif/arp.c - src/sys/net/netif/ethernetif.c + net/pbuf.h + net/ipv4/ip_addr.h + net/netif.h - - net/netif.h - - - - - - - - - - - - - - arch/cpu.h - - - + src/sys/include/netif/arp.h - + - + - + - - ubixos/types.h - - - - - - sys/_types.h - - - - net/arch.h - - - - - - - - net/lwipopts.h - - - - net/ipv4/ip_addr.h - - - - - - net/err.h - - - - - - - - - - net/opt.h - - - - - + net/pbuf.h - - - - - - - net/debug.h - + + net/ipv4/ip_addr.h - - net/ipv4/inet.h - - - - - - - - - - - - arch/cc.h - + + net/netif.h - - - src/sys/include/netif/arp.h - - - - - - - - src/sys/net/netif/ethernetif.c - - - - src/sys/net/netif/arp.c - - - eth_addr eth_hdr @@ -140,8 +39,6 @@ - arp_timer - ethernetif_init ETHTYPE_ARP @@ -153,9 +50,6 @@ - arp_arp_input - arp_query - ethernetif_input ETHTYPE_IP @@ -167,20 +61,16 @@ - arp_arp_input - arp_query - ethernetif_input - ethernetif_output - pbuf * + pbuf * struct pbuf* arp_arp_input (struct netif *netif, struct eth_addr *ethaddr, struct pbuf *p) arp_arp_input - struct netif * + struct netif * netif @@ -188,7 +78,7 @@ ethaddr - struct pbuf * + struct pbuf * p @@ -197,25 +87,7 @@ - - add_arp_entry - ARP_REPLY - ARP_REQUEST - ARPH_HWLEN_SET - ARPH_PROTOLEN_SET - ETHTYPE_ARP - ETHTYPE_IP - htons - HWTYPE_ETHERNET - netif::ip_addr - ip_addr_cmp - ip_addr_set - kprintf - NULL - pbuf::payload - pbuf_free - pbuf::tot_len - ethernetif_input + void @@ -231,13 +103,7 @@ - - arp_table - ARP_TABLE_SIZE - IP_ADDR_ANY - ip_addr_set - arp_entry::ipaddr - ethernetif_init + void @@ -245,11 +111,11 @@ (struct netif *netif, struct pbuf *p) arp_ip_input - struct netif * + struct netif * netif - struct pbuf * + struct pbuf * p @@ -258,15 +124,7 @@ - - add_arp_entry - ARP_DEBUG - DEBUGF - netif::ip_addr - ip_addr_maskcmp - netif::netmask - pbuf::payload - ethernetif_input + eth_addr * @@ -274,7 +132,7 @@ (struct ip_addr *ipaddr) arp_lookup - struct ip_addr * + struct ip_addr * ipaddr @@ -283,20 +141,15 @@ - - arp_table - ARP_TABLE_SIZE - ip_addr_cmp - NULL - ethernetif_output + - pbuf * + pbuf * struct pbuf* arp_query (struct netif *netif, struct eth_addr *ethaddr, struct ip_addr *ipaddr) arp_query - struct netif * + struct netif * netif @@ -304,7 +157,7 @@ ethaddr - struct ip_addr * + struct ip_addr * ipaddr @@ -313,22 +166,7 @@ - - ARP_REQUEST - ARPH_HWLEN_SET - ARPH_PROTOLEN_SET - ETHTYPE_ARP - ETHTYPE_IP - htons - HWTYPE_ETHERNET - netif::ip_addr - ip_addr_set - NULL - pbuf::payload - pbuf_alloc - PBUF_LINK - PBUF_RAM - ethernetif_output + void @@ -344,18 +182,7 @@ - - ARP_DEBUG - ARP_MAXAGE - arp_table - ARP_TABLE_SIZE - ctime - DEBUGF - IP_ADDR_ANY - ip_addr_isany - ip_addr_set - arp_entry::ipaddr - arp_timer + @@ -434,19 +261,19 @@ #ifndef__NETIF_ARP_H__ #define__NETIF_ARP_H__ -#include"net/pbuf.h" -#include"net/ipv4/ip_addr.h" -#include"net/netif.h" +#include"net/pbuf.h" +#include"net/ipv4/ip_addr.h" +#include"net/netif.h" structeth_addr{ PACK_STRUCT_FIELD(uInt8addr[6]); -}PACK_STRUCT_STRUCT; +}PACK_STRUCT_STRUCT; structeth_hdr{ PACK_STRUCT_FIELD(structeth_addrdest); PACK_STRUCT_FIELD(structeth_addrsrc); PACK_STRUCT_FIELD(uInt16type); -}PACK_STRUCT_STRUCT; +}PACK_STRUCT_STRUCT; #defineARP_TMR_INTERVAL10000 @@ -465,25 +292,25 @@ doesnotalterthepacketinanyway,itjustupdatestheARP table.Afterthisfunctionhasbeencalled,thenormalTCP/IPstack inputfunctionshouldbecalled.*/ -voidarp_ip_input(structnetif*netif,structpbuf*p); +voidarp_ip_input(structnetif*netif,structpbuf*p); /*ShouldbecalledforincomingARPpackets.Thepbufintheargument isfreedbythisfunction.Ifthefunctionreturnsapbuf(i.e., returnsnon-NULL),thatpbufconstitutesanARPreplyandshouldbe sentoutontheEthernet.*/ -structpbuf*arp_arp_input(structnetif*netif,structeth_addr*ethaddr, -structpbuf*p); +structpbuf*arp_arp_input(structnetif*netif,structeth_addr*ethaddr, +structpbuf*p); /*arp_loopup()iscalledtodoanIPaddress->Ethernetaddress translation.IfthefunctionreturnsNULL,thereisnomappingand thearp_query()functionshouldbecalled.*/ -structeth_addr*arp_lookup(structip_addr*ipaddr); +structeth_addr*arp_lookup(structip_addr*ipaddr); /*ConstructsanARPquerypacketforthegivenIPaddress.The functionreturnsapbufthatcontainsthereplyandthatshouldbe sentoutontheEthernet.*/ -structpbuf*arp_query(structnetif*netif,structeth_addr*ethaddr, -structip_addr*ipaddr); +structpbuf*arp_query(structnetif*netif,structeth_addr*ethaddr, +structip_addr*ipaddr); #endif/*__NETIF_ARP_H__*/ diff --git a/doc/xml/assert_8c.xml b/doc/xml/assert_8c.xml index 0fe8b7c..cb63a7e 100644 --- a/doc/xml/assert_8c.xml +++ b/doc/xml/assert_8c.xml @@ -6,37 +6,37 @@ lib/kprintf.h ubixos/kpanic.h - + ubixos/kpanic.h - + ubixos/types.h - + - + sys/_types.h - + lib/kprintf.h - + - + src/sys/lib/assert.c - + - + - + - + assert.h @@ -72,7 +72,7 @@ kpanic kprintf - NULL + NULL @@ -113,8 +113,8 @@ #include<lib/kprintf.h> #include<ubixos/kpanic.h> -void__assert(constchar*func,constchar*file,intline,constchar*failedexpr){ -if(func==NULL) +void__assert(constchar*func,constchar*file,intline,constchar*failedexpr){ +if(func==NULL) kprintf( "Assertionfailed:(%s),file%s,line%d.\n",failedexpr, file,line); diff --git a/doc/xml/assert_8h.xml b/doc/xml/assert_8h.xml index b564017..514ea8f 100644 --- a/doc/xml/assert_8h.xml +++ b/doc/xml/assert_8h.xml @@ -24,133 +24,133 @@ src/sys/vmm/paging.c src/sys/vmm/vmm_memory.c - + src/sys/kmods/kmod.c - + src/sys/kernel/kern_sysctl.c - + src/sys/kernel/pipe.c - + src/sys/lib/kmalloc.c - + src/sys/vmm/paging.c - + src/sys/kernel/kern_sig.c - + src/sys/kernel/ld.c - + src/sys/kernel/fork.c - + src/sys/kernel/sched.c - + src/sys/ubixfs/dirCache.c - + src/sys/ubixfs/ubixfs.c - + src/sys/lib/assert.c - + src/sys/kernel/bioscall.c - + src/sys/sys/device.c - + src/sys/include/assert.h - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + src/sys/isa/ne2k.c - + src/sys/kernel/time.c - + src/sys/vmm/vmm_memory.c - + src/sys/kernel/kern_descrip.c - + src/sys/vfs/file.c - + src/sys/kernel/gen_calls.c - + src/sys/kernel/exec.c @@ -228,9 +228,9 @@ - - __BEGIN_DECLS void - __BEGIN_DECLS void __assert + + void + void __assert (const char *, const char *, int, const char *) __assert @@ -254,7 +254,7 @@ kpanic kprintf - NULL + NULL @@ -330,7 +330,7 @@ #endif/*NDEBUG*/ __BEGIN_DECLS -void__assert(constchar*,constchar*,int,constchar*); +void__assert(constchar*,constchar*,int,constchar*); __END_DECLS diff --git a/doc/xml/atan_8c.xml b/doc/xml/atan_8c.xml index 09425cf..e35e3ef 100644 --- a/doc/xml/atan_8c.xml +++ b/doc/xml/atan_8c.xml @@ -4,26 +4,26 @@ atan.c math.h - + src/sys/lib/atan.c - + - + ubixos/types.h - + - + sys/_types.h - + math.h - + diff --git a/doc/xml/atkbd_8c.xml b/doc/xml/atkbd_8c.xml index abb617b..44ed4ea 100644 --- a/doc/xml/atkbd_8c.xml +++ b/doc/xml/atkbd_8c.xml @@ -18,232 +18,230 @@ ubixos/kpanic.h ubixos/vitals.h - + sys/thread.h - + - + ubixos/kpanic.h - + ubixos/sched.h - + - + - + - + - + - + - + ubixos/spinlock.h - + - + ubixos/endtask.h - + - + - + ubixos/vitals.h - + - + - + - + - + ubixos/types.h - + - + sys/_types.h - + sys/video.h - + - + ubixos/time.h - + - + - + vfs/file.h - + - + - + - + sys/tss.h - + - + lib/kmalloc.h - + - + sys/idt.h - + - + - + vfs/vfs.h - + - + - + - + - + - + vfs/mount.h - - - + - + lib/kprintf.h - + - + isa/atkbd.h - + sys/gdt.h - + ubixos/ubthread.h - + - + - + - + ubixfs/dirCache.h - + - + src/sys/isa/atkbd.c - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + sys/sysproto.h - + - + - + ubixos/elf.h - + - + sys/signal.h - + - + ubixos/tty.h - + - + sys/io.h - + isa/8259.h - + @@ -293,7 +291,7 @@ dDpl0 dInt dPresent - irqEnable + irqEnable kprintf mVec setLED diff --git a/doc/xml/atkbd_8h.xml b/doc/xml/atkbd_8h.xml index adeec81..ce0c394 100644 --- a/doc/xml/atkbd_8h.xml +++ b/doc/xml/atkbd_8h.xml @@ -2,29 +2,29 @@ atkbd.h - src/sys/include/ubixos/init.h + src/sys/include/ubixos/init.h src/sys/isa/atkbd.c - + src/sys/init/main.c - + src/sys/include/isa/atkbd.h - + - + - + src/sys/isa/atkbd.c - + src/sys/include/ubixos/init.h - - + + @@ -120,7 +120,7 @@ dDpl0 dInt dPresent - irqEnable + irqEnable kprintf mVec setLED diff --git a/doc/xml/bcopy_8c.xml b/doc/xml/bcopy_8c.xml index 1498e91..01beaf5 100644 --- a/doc/xml/bcopy_8c.xml +++ b/doc/xml/bcopy_8c.xml @@ -7,45 +7,45 @@ string.h src/sys/lib/memcpy.c - + ubixos/types.h - + - + sys/_types.h - + string.h - + - + strings.h - + src/sys/lib/bcopy.c - + - + - + - + src/sys/lib/memcpy.c - + src/sys/lib/bcopy.c - + @@ -237,7 +237,7 @@ #include<strings.h> void -bcopy(constvoid*src0,void*dst0,size_tlength) +bcopy(constvoid*src0,void*dst0,size_tlength) #endif { char*dst=dst0; diff --git a/doc/xml/bioscall_8c.xml b/doc/xml/bioscall_8c.xml index afe0acc..5d99509 100644 --- a/doc/xml/bioscall_8c.xml +++ b/doc/xml/bioscall_8c.xml @@ -11,172 +11,156 @@ sys/video.h assert.h - + sys/thread.h - + - + ubixos/sched.h - + - + - + - + - + - + - + lib/bioscall.h - + - + ubixos/types.h - + - + sys/_types.h - + sys/video.h - + - + lib/string.h - + - + vmm/paging.h - + - + - + - + vfs/file.h - + - + - + - + sys/tss.h - + - + lib/kmalloc.h - + - + vmm/vmm.h - + - + - - vfs/vfs.h - - - - - - - - - - - - - + vfs/mount.h - - - + - + src/sys/kernel/bioscall.c - + - + - + - + - + - + - + - + - + assert.h - + ubixfs/dirCache.h - + - + sys/sysproto.h - + - + - + ubixos/elf.h - + - + sys/signal.h - + - + ubixos/tty.h - + diff --git a/doc/xml/bioscall_8h.xml b/doc/xml/bioscall_8h.xml index 8d13614..2073b10 100644 --- a/doc/xml/bioscall_8h.xml +++ b/doc/xml/bioscall_8h.xml @@ -6,37 +6,37 @@ src/sys/kernel/bioscall.c src/sys/kernel/systemtask.c - + src/sys/include/lib/bioscall.h - + - + ubixos/types.h - + - + sys/_types.h - + src/sys/include/lib/bioscall.h - + - + - + src/sys/kernel/systemtask.c - + src/sys/kernel/bioscall.c diff --git a/doc/xml/block_8c.xml b/doc/xml/block_8c.xml index 4cbb998..1551f18 100644 --- a/doc/xml/block_8c.xml +++ b/doc/xml/block_8c.xml @@ -6,144 +6,142 @@ vfs/file.h vfs/mount.h - + sys/thread.h - + - + ubixos/sched.h - + - + - + - + - + - + - + ubixos/types.h - + - + sys/_types.h - + vfs/file.h - + - + - + - + sys/tss.h - + - + src/sys/ubixfs/block.c - + - + - + - + mpi/mpi.h - + - + - + vfs/vfs.h - + - + - + - + - + - + vfs/mount.h - - - + - + ubixfs/ubixfs.h - + - + - + - + - + - + ubixfs/dirCache.h - + - + sys/sysproto.h - + - + - + ubixos/elf.h - + - + sys/signal.h - + - + ubixos/tty.h - + - + sys/device.h - + @@ -170,7 +168,7 @@ blockAllocationTableEntry::attributes ubixFSInfo::blockAllocationTable - vfs_mountPoint::fsInfo + vfs_mountPoint::fsInfo fileDescriptorStruct::mp blockAllocationTableEntry::nextBlock syncBat @@ -198,7 +196,7 @@ blockAllocationTableEntry::attributes ubixFSInfo::batEntries ubixFSInfo::blockAllocationTable - vfs_mountPoint::fsInfo + vfs_mountPoint::fsInfo fileDescriptorStruct::mp blockAllocationTableEntry::nextBlock syncBat @@ -223,13 +221,13 @@ ubixFSInfo::blockAllocationTable - vfs_mountPoint::device + vfs_mountPoint::device device_node::devInfo - vfs_mountPoint::diskLabel - vfs_mountPoint::fsInfo + vfs_mountPoint::diskLabel + vfs_mountPoint::fsInfo device_interface::info - vfs_mountPoint::partition - ubixDiskLabel::partitions + vfs_mountPoint::partition + ubixDiskLabel::partitions device_interface::write freeBlocks getFreeBlocks @@ -315,7 +313,7 @@ voidsyncBat(structvfs_mountPoint*mp){ structubixFSInfo*fsInfo=mp->fsInfo; -mp->device->devInfo->write(mp->device->devInfo->info,fsInfo->blockAllocationTable,mp->diskLabel->partitions[mp->partition].pOffset,mp->diskLabel->partitions[mp->partition].pBatSize); +mp->device->devInfo->write(mp->device->devInfo->info,fsInfo->blockAllocationTable,mp->diskLabel->partitions[mp->partition].pOffset,mp->diskLabel->partitions[mp->partition].pBatSize); } intfreeBlocks(intblock,fileDescriptor*fd){ diff --git a/doc/xml/buf_8h.xml b/doc/xml/buf_8h.xml index cc5f0f6..7896216 100644 --- a/doc/xml/buf_8h.xml +++ b/doc/xml/buf_8h.xml @@ -7,100 +7,98 @@ sys/device.h src/sys/ufs/ffs.c - + sys/thread.h - + - + ubixos/types.h - + - + sys/_types.h - + vfs/file.h - + - + - + - + vfs/vfs.h - + - + - + - + - + - + vfs/mount.h - - - + - + ubixfs/dirCache.h - + - + sys/sysproto.h - + - + - + sys/signal.h - + - + src/sys/include/sys/buf.h - + - + - + - + sys/device.h - + - + src/sys/ufs/ffs.c - + src/sys/include/sys/buf.h - + diff --git a/doc/xml/cdefs_8h.xml b/doc/xml/cdefs_8h.xml index 64c4b1e..a4031ae 100644 --- a/doc/xml/cdefs_8h.xml +++ b/doc/xml/cdefs_8h.xml @@ -5,32 +5,32 @@ ubixos/types.h src/sys/lib/strtol.c - + ubixos/types.h - + - + sys/_types.h - + src/sys/include/sys/cdefs.h - + - + src/sys/lib/strtol.c - + src/sys/include/sys/cdefs.h - + diff --git a/doc/xml/classogDisplay__UbixOS.xml b/doc/xml/classogDisplay__UbixOS.xml index 4e73a06..096aa53 100644 --- a/doc/xml/classogDisplay__UbixOS.xml +++ b/doc/xml/classogDisplay__UbixOS.xml @@ -366,21 +366,21 @@ - + ogModeInfo - + ogDisplay_UbixOS - + VESAInfo - + modeInfo - + ogVESAInfo diff --git a/doc/xml/copyvirtualspace_8c.xml b/doc/xml/copyvirtualspace_8c.xml index 019d3c6..54847bc 100644 --- a/doc/xml/copyvirtualspace_8c.xml +++ b/doc/xml/copyvirtualspace_8c.xml @@ -8,90 +8,90 @@ ubixos/kpanic.h string.h - + sys/thread.h - + - + ubixos/kpanic.h - + ubixos/spinlock.h - + - + ubixos/types.h - + - + sys/_types.h - + vmm/paging.h - + - + - + - + string.h - + - + sys/kern_sysctl.h - + - + - + vmm/vmm.h - + - + - + sys/sysproto.h - + - + - + sys/signal.h - + - + src/sys/vmm/copyvirtualspace.c - + - + - + - + - + diff --git a/doc/xml/createvirtualspace_8c.xml b/doc/xml/createvirtualspace_8c.xml index b33ed35..2e0174d 100644 --- a/doc/xml/createvirtualspace_8c.xml +++ b/doc/xml/createvirtualspace_8c.xml @@ -4,58 +4,58 @@ createvirtualspace.c vmm/vmm.h - + sys/thread.h - + - + ubixos/types.h - + - + sys/_types.h - + vmm/paging.h - + - + - + - + src/sys/vmm/createvirtualspace.c - + - + vmm/vmm.h - + - + - + sys/sysproto.h - + - + - + sys/signal.h - + diff --git a/doc/xml/devfs_8c.xml b/doc/xml/devfs_8c.xml index 6e20670..78bf422 100644 --- a/doc/xml/devfs_8c.xml +++ b/doc/xml/devfs_8c.xml @@ -12,136 +12,134 @@ lib/string.h lib/kprintf.h - + sys/thread.h - + - + ubixos/kpanic.h - + ubixos/spinlock.h - + - + devfs/devfs.h - + - + - + ubixos/types.h - + - + sys/_types.h - + lib/string.h - + - + vfs/file.h - + - + - + - + lib/kmalloc.h - + - + vfs/vfs.h - + - + - + - + - + - + vfs/mount.h - - - + - + lib/kprintf.h - + - + ubixfs/dirCache.h - + - + src/sys/devfs/devfs.c - + - + - + - + - + - + - + - + - + - + sys/sysproto.h - + - + - + sys/signal.h - + - + sys/device.h - + @@ -162,7 +160,7 @@ devfs_open devfs_read devfs_write - NULL + NULL vfs_mount vfsRegisterFS x1 @@ -184,7 +182,7 @@ devfs_info::deviceList - vfs_mountPoint::fsInfo + vfs_mountPoint::fsInfo K_PANIC kmalloc devfs_init @@ -224,7 +222,7 @@ devfs_devices::devMinor devfs_devices::devName devfs_devices::devType - vfs_mountPoint::fsInfo + vfs_mountPoint::fsInfo kmalloc kprintf devfs_devices::next @@ -265,7 +263,7 @@ devfs_devices::devMajor devfs_devices::devMinor devfs_devices::devName - vfs_mountPoint::fsInfo + vfs_mountPoint::fsInfo kprintf fileDescriptorStruct::mode fileDescriptorStruct::mp @@ -598,8 +596,8 @@ intdevfs_init(){ /*Buildourdevfsstruct*/ structfileSystemdevFS= -{NULL,/*prev*/ -NULL,/*next*/ +{NULL,/*prev*/ +NULL,/*next*/ (void*)devfs_initialize,/*vfsInitFS*/ (void*)devfs_read,/*vfsRead*/ (void*)devfs_write,/*vfsWrite*/ diff --git a/doc/xml/devfs_8h.xml b/doc/xml/devfs_8h.xml index 96dc663..9bbf115 100644 --- a/doc/xml/devfs_8h.xml +++ b/doc/xml/devfs_8h.xml @@ -5,119 +5,83 @@ ubixos/types.h vfs/file.h src/sys/devfs/devfs.c - src/sys/include/ubixos/init.h + src/sys/include/ubixos/init.h src/sys/isa/fdc.c src/sys/pci/hd.c - - sys/thread.h - - - - - + src/sys/include/devfs/devfs.h - + - + - + ubixos/types.h - + - + sys/_types.h - + vfs/file.h - + - + - + - - vfs/vfs.h - - - - - - - - - - - - - + vfs/mount.h - - - + - + ubixfs/dirCache.h - - - - - sys/sysproto.h - - - - - - - - sys/signal.h - - + - + src/sys/pci/hd.c - + src/sys/include/devfs/devfs.h - + - + - + - + - + src/sys/init/main.c - + src/sys/include/ubixos/init.h - - + + - + src/sys/devfs/devfs.c - + src/sys/isa/fdc.c @@ -141,7 +105,7 @@ devfs_open devfs_read devfs_write - NULL + NULL vfs_mount vfsRegisterFS x1 @@ -181,7 +145,7 @@ devfs_devices::devMinor devfs_devices::devName devfs_devices::devType - vfs_mountPoint::fsInfo + vfs_mountPoint::fsInfo kmalloc kprintf devfs_devices::next diff --git a/doc/xml/device_8c.xml b/doc/xml/device_8c.xml index 2fdc146..3c56e27 100644 --- a/doc/xml/device_8c.xml +++ b/doc/xml/device_8c.xml @@ -8,56 +8,56 @@ lib/kprintf.h assert.h - + ubixos/spinlock.h - + - + ubixos/types.h - + - + sys/_types.h - + lib/kmalloc.h - + - + lib/kprintf.h - + - + src/sys/sys/device.c - + - + - + - + - + - + assert.h - + sys/device.h - + @@ -95,7 +95,7 @@ kprintf device_node::minor device_node::next - NULL + NULL device_node::prev spinLock spinUnlock @@ -156,7 +156,7 @@ deviceSpinLock kfree device_node::next - NULL + NULL spinLock spinUnlock @@ -257,7 +257,7 @@ tmpDev=(structdevice_node*)kmalloc(sizeof(structdevice_node)); -if(tmpDev==NULL) +if(tmpDev==NULL) kprintf("ErrorAddingDevice:memoryfailure\n"); tmpDev->prev=0x0; @@ -317,9 +317,9 @@ current=devices; -previous=NULL; +previous=NULL; spinLock(&deviceSpinLock); -while(current!=NULL) +while(current!=NULL) { if(current==deviceToDelete)break; else @@ -328,7 +328,7 @@ current=current->next; } } -if(current==NULL) +if(current==NULL) { spinUnlock(&deviceSpinLock); return1; diff --git a/doc/xml/device_8old_8h.xml b/doc/xml/device_8old_8h.xml index 504328a..e1c625c 100644 --- a/doc/xml/device_8old_8h.xml +++ b/doc/xml/device_8old_8h.xml @@ -5,62 +5,53 @@ ubixos/types.h src/sys/include/isa/ne2k.h src/sys/isa/ne2k.c - src/sys/net/netif/ethernetif.c - + src/sys/include/sys/device.old.h - + - + ubixos/types.h - + - + sys/_types.h - + src/sys/include/sys/device.old.h - + - - - + - + src/sys/include/isa/ne2k.h - + - - - + - - src/sys/net/netif/ethernetif.c - - - + src/sys/init/main.c - + src/sys/isa/ne2k.c - + src/sys/include/ubixos/init.h - - + + diff --git a/doc/xml/dirCache_8c.xml b/doc/xml/dirCache_8c.xml index 59ceb64..626c5b1 100644 --- a/doc/xml/dirCache_8c.xml +++ b/doc/xml/dirCache_8c.xml @@ -10,180 +10,178 @@ lib/string.h ubixos/spinlock.h - + sys/thread.h - + - + ubixos/sched.h - + - + - + - + - + - + - + ubixos/spinlock.h - + - + ubixos/types.h - + - + sys/_types.h - + lib/string.h - + - + vfs/file.h - + - + - + - + sys/tss.h - + - + lib/kmalloc.h - + - + mpi/mpi.h - + - + - + src/sys/ubixfs/dirCache.c - + - + - + - + - + - + - + - + vfs/vfs.h - + - + - + - + - + - + vfs/mount.h - - - + - + lib/kprintf.h - + - + ubixfs/ubixfs.h - + - + - + - + - + - + assert.h - + ubixfs/dirCache.h - + - + sys/sysproto.h - + - + - + ubixos/elf.h - + - + sys/signal.h - + - + ubixos/tty.h - + - + sys/device.h - + @@ -213,7 +211,7 @@ cacheNode::fileListHead cacheNode::fileListTail cacheNode::next - NULL + NULL cacheNode::parent cacheNode::prev spinLock @@ -241,7 +239,7 @@ kfree cacheNode::name cacheNode::next - NULL + NULL ubixfs_cacheDelete ubixfs_cacheDelete @@ -274,7 +272,7 @@ cacheNode::info cacheNode::name cacheNode::next - NULL + NULL cacheNode::parent cacheNode::permissions cacheNode::present @@ -317,7 +315,7 @@ kmalloc cacheNode::name cacheNode::next - NULL + NULL cacheNode::parent cacheNode::permissions cacheNode::present @@ -355,7 +353,7 @@ dirList directoryEntry::fileName - NULL + NULL strcmp ubixfs_cacheFind @@ -428,29 +426,29 @@ ubixfs_findName(structdirectoryEntry*dirList,uInt32size,char*name){ unsignedinti; -if(dirList==NULL||name==NULL)returnNULL; +if(dirList==NULL||name==NULL)returnNULL; //UBUkprintf("dirList:[0x%X],name:[0x%X]\n",dirList,name); for(i=0;i<(size/sizeof(structdirectoryEntry));i++){ if(strcmp(dirList[i].fileName,name)==0)return&dirList[i]; }/*for*/ -returnNULL; +returnNULL; }/*ubixfs_findName*/ structcacheNode* ubixfs_cacheFind(structcacheNode*head,char*name){ structcacheNode*tmp=head; -structdirectoryEntry*dirList=NULL; +structdirectoryEntry*dirList=NULL; unsignedinti=0x0; chardirName[256]; -char*nextDir=NULL; +char*nextDir=NULL; /*kprintf("lookingfor%s\n",name);*/ assert(name); assert(head); assert(*name); spinLock(&dca_spinLock); spinUnlock(&dca_spinLock); -if(name==NULL||head==NULL)returnNULL; -if(*name=='\0')returnNULL; +if(name==NULL||head==NULL)returnNULL; +if(*name=='\0')returnNULL; /* *walkdownthetreerecursivelyuntilwefindthenodewe'relooking @@ -462,7 +460,7 @@ i++; }/*while*/ assert(i<sizeof(dirName)); -if(i==sizeof(dirName))returnNULL; +if(i==sizeof(dirName))returnNULL; if(i==0)dirName[i++]='/'; @@ -478,17 +476,17 @@ */ /*kprintf("nextdir:%s--dirName:%s\n",nextDir,dirName);*/ if(*nextDir!='\0'){ -while(tmp!=NULL){ +while(tmp!=NULL){ //UBUkprintf("tmp->name:[0x%X],dirName:[0x%X]\n",tmp->name,dirName); if(strcmp(tmp->name,dirName)==0){ if((*tmp->attributes&typeFile)==typeFile -||tmp->fileListHead==NULL){ +||tmp->fileListHead==NULL){ /*ifwe'rehere,thentherearenosubdirscachedtolookthrough*/ dirList=ubixfs_findName((structdirectoryEntry*)head->info, *head->size,nextDir); -if(dirList==NULL)returnNULL; +if(dirList==NULL)returnNULL; /*kprintf("creatingnewnode%s",dirList->fileName);*/ tmp=ubixfs_cacheAdd(tmp,ubixfs_cacheNew(dirList->fileName)); tmp->attributes=&dirList->attributes; @@ -505,14 +503,14 @@ tmp=tmp->next; }/*while*/ /*itwasn'tpresent,returnNULL*/ -returnNULL; +returnNULL; }/*if*/ /* *ifnextDirwasnull,thenwe'reatthebottomlevel.Lookforthe *dirlistinghere */ -while(tmp!=NULL){ +while(tmp!=NULL){ assert(tmp->name); assert(name); @@ -533,10 +531,10 @@ tmp->parent->fileListTail=tmp->prev; }/*if*/ -if(tmp->next!=NULL)tmp->next->prev=tmp->prev; -if(tmp->prev!=NULL)tmp->prev->next=tmp->next; +if(tmp->next!=NULL)tmp->next->prev=tmp->prev; +if(tmp->prev!=NULL)tmp->prev->next=tmp->next; tmp->next=tmp->parent->fileListHead; -tmp->prev=NULL; +tmp->prev=NULL; tmp->parent->fileListHead=tmp; }/*if*/ #endif @@ -551,7 +549,7 @@ assert(tmp->info); dirList=ubixfs_findName((structdirectoryEntry*)tmp->info, *tmp->size,name); -if(dirList==NULL)returnNULL; +if(dirList==NULL)returnNULL; /*kprintf("creatingnewnode/size%s/%d",dirList->fileName,dirList->size);*/ tmp=ubixfs_cacheAdd(tmp,ubixfs_cacheNew(dirList->fileName)); tmp->attributes=&dirList->attributes; @@ -562,7 +560,7 @@ tmp->present=0; returntmp; #if0 -returnNULL;/*couldn'tfindit*/ +returnNULL;/*couldn'tfindit*/ #endif }/*ubixfs_cacheFind*/ @@ -571,13 +569,13 @@ structcacheNode*tmp=kmalloc(sizeof(structcacheNode)); assert(tmp); tmp->parent=tmp; -tmp->prev=tmp->next=tmp->fileListHead=tmp->fileListTail=NULL; -tmp->info=NULL; -tmp->size=NULL; +tmp->prev=tmp->next=tmp->fileListHead=tmp->fileListTail=NULL; +tmp->info=NULL; +tmp->size=NULL; tmp->present=tmp->dirty=0; -tmp->startCluster=NULL; -tmp->attributes=NULL; -tmp->permissions=NULL; +tmp->startCluster=NULL; +tmp->attributes=NULL; +tmp->permissions=NULL; tmp->name=(char*)kmalloc(strlen(name)+1); strcpy(tmp->name,name); returntmp; @@ -585,14 +583,14 @@ void ubixfs_cacheDelete(structcacheNode**head){ -structcacheNode*tmp=NULL; -structcacheNode*del=NULL; +structcacheNode*tmp=NULL; +structcacheNode*del=NULL; -if(head==NULL)return; -if(*head==NULL)return; +if(head==NULL)return; +if(*head==NULL)return; tmp=*head; -while(tmp!=NULL){ +while(tmp!=NULL){ /*ifthereareanychildnodes,deletethemfirst*/ /* @@ -608,16 +606,16 @@ tmp=tmp->next; kfree(del); }/*while*/ -*head=NULL; +*head=NULL; return; }/*deleteNode*/ #if0 void addNode(structcacheNode**node,structcacheNode*newNode){ -if(node==NULL)return; +if(node==NULL)return; newNode->next=*node; -if(*node!=NULL)(*node)->prev=newNode; -newNode->prev=NULL; +if(*node!=NULL)(*node)->prev=newNode; +newNode->prev=NULL; *node=newNode; return; }/*addNode*/ @@ -631,8 +629,8 @@ spinLock(&dca_spinLock); newNode->parent=node; newNode->next=node->fileListHead; -newNode->prev=NULL; -if(node->fileListHead==NULL) +newNode->prev=NULL; +if(node->fileListHead==NULL) node->fileListTail=newNode; else node->fileListHead->prev=newNode; diff --git a/doc/xml/dirCache_8h.xml b/doc/xml/dirCache_8h.xml index 9a2f4d5..474153c 100644 --- a/doc/xml/dirCache_8h.xml +++ b/doc/xml/dirCache_8h.xml @@ -8,579 +8,515 @@ src/sys/ubixfs/dirCache.c src/sys/ubixfs/ubixfs.c - + ubixos/types.h - + - + sys/_types.h - + src/sys/include/ubixfs/dirCache.h - + - + src/sys/ufs/ffs.c - + src/sys/include/ufs/ufs.h - + - + - + - + src/sys/include/ubixos/sched.h - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - + - + src/sys/pci/hd.c - - src/sys/net/netif/tcpdump.c - - - + src/sys/include/ufs/ffs.h - + - + - + src/sys/include/ubixos/endtask.h - + - + - + - + - + - + - + - + - - - + - - src/sys/net/net/sys_arch.c - - - + src/sys/kernel/vitals.c - + src/sys/include/devfs/devfs.h - + - + - + - + - + src/sys/mpi/message.c - + src/sys/kmods/kmod.c - + src/sys/mpi/system.c - + src/sys/kernel/kern_sysctl.c - + src/sys/include/ubixos/vitals.h - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + src/sys/kernel/pipe.c - + src/sys/lib/kmalloc.c - + src/sys/vmm/paging.c - + src/sys/ubixfs/directory.c - + src/sys/ufs/ufs.c - + src/sys/kernel/kern_sig.c - + src/sys/kernel/ubthread.c - + src/sys/kernel/systemtask.c - - src/sys/net/netif/ethernetif.c - - - + src/sys/lib/ogprintf.cc - + src/sys/kernel/ld.c - + src/sys/include/vfs/file.h - + - + - + - + - + - + - + - + - - - + - + src/sys/kernel/fork.c - - src/sys/net/api/tcpip.c - - - + src/sys/ubixfs/block.c - + src/sys/kernel/sched.c - - src/sys/net/net/shell.c - - - + src/sys/include/mpi/mpi.h - + - + - + - + - + - + src/sys/include/ubixos/fork.h - - - + - + src/sys/ubixfs/dirCache.c - + src/sys/ubixfs/ubixfs.c - - src/sys/net/net/init.c - - - + src/sys/include/vfs/vfs.h - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + - - src/sys/include/vfs/mount.h - - - - - - - - - - - - - - - - - - - + src/sys/init/main.c - + src/sys/include/ubixfs/ubixfs.h - + - + - + - + - + - + - + - + - + src/sys/kernel/bioscall.c - + src/sys/include/sys/kern_descrip.h - + - + - + - + - + - + src/sys/include/ubixos/ubthread.h - + - - - + - + src/sys/kernel/syscall.c - + src/sys/include/ubixfs/dirCache.h - + - + - + - + - + src/sys/isa/ne2k.c - + src/sys/include/ubixos/exec.h - + - + - + - + - + - - - - - + - + src/sys/include/ubixos/syscalls.h - + - + src/sys/include/pci/hd.h - + - + - + src/sys/isa/atkbd.c - + src/sys/vmm/pagefault.c - + src/sys/ubixfs/thread.c - + src/sys/include/ubixos/init.h - - + + - + src/sys/vfs/mount.c - + src/sys/devfs/devfs.c - + src/sys/kernel/time.c - + src/sys/vmm/vmm_memory.c - + src/sys/kernel/spinlock.c - + src/sys/kernel/kern_descrip.c - + src/sys/kernel/endtask.c - + src/sys/vfs/file.c - + src/sys/sys/idt.c - + src/sys/kernel/gen_calls.c - + src/sys/kernel/syscall_new.c - + src/sys/kernel/exec.c - + src/sys/include/sys/buf.h - + - + src/sys/isa/fdc.c - + src/sys/vmm/getfreevirtualpage.c - + src/sys/vfs/vfs.c @@ -610,7 +546,7 @@ cacheNode::fileListHead cacheNode::fileListTail cacheNode::next - NULL + NULL cacheNode::parent cacheNode::prev spinLock @@ -637,7 +573,7 @@ kfree cacheNode::name cacheNode::next - NULL + NULL ubixfs_cacheDelete ubixfs_cacheDelete @@ -668,7 +604,7 @@ cacheNode::info cacheNode::name cacheNode::next - NULL + NULL cacheNode::parent cacheNode::permissions cacheNode::present @@ -710,7 +646,7 @@ kmalloc cacheNode::name cacheNode::next - NULL + NULL cacheNode::parent cacheNode::permissions cacheNode::present diff --git a/doc/xml/dir_832905b1f7f5feaf61a306b40c0ac817.xml b/doc/xml/dir_832905b1f7f5feaf61a306b40c0ac817.xml index 1c25511..56d49b1 100644 --- a/doc/xml/dir_832905b1f7f5feaf61a306b40c0ac817.xml +++ b/doc/xml/dir_832905b1f7f5feaf61a306b40c0ac817.xml @@ -2,7 +2,6 @@ src/sys/ - src/sys/compile/ src/sys/devfs/ src/sys/include/ src/sys/init/ @@ -11,14 +10,12 @@ src/sys/kmods/ src/sys/lib/ src/sys/mpi/ - src/sys/net/ src/sys/pci/ src/sys/sys/ src/sys/ubixfs/ src/sys/ufs/ src/sys/vfs/ src/sys/vmm/ - Makefile.inc diff --git a/doc/xml/dir_9854bc9d2b9a2a73f32c73e97d31d0f7.xml b/doc/xml/dir_9854bc9d2b9a2a73f32c73e97d31d0f7.xml index a2df7d5..073baca 100644 --- a/doc/xml/dir_9854bc9d2b9a2a73f32c73e97d31d0f7.xml +++ b/doc/xml/dir_9854bc9d2b9a2a73f32c73e97d31d0f7.xml @@ -6,7 +6,7 @@ endtask.h exec.h fork.h - init.h + init.h kmod.h kpanic.h ld.h diff --git a/doc/xml/dir_caf4200c438ae9601464168e21e8e4d8.xml b/doc/xml/dir_caf4200c438ae9601464168e21e8e4d8.xml index 9e90324..76b5079 100644 --- a/doc/xml/dir_caf4200c438ae9601464168e21e8e4d8.xml +++ b/doc/xml/dir_caf4200c438ae9601464168e21e8e4d8.xml @@ -6,9 +6,7 @@ src/sys/include/isa/ src/sys/include/lib/ src/sys/include/mpi/ - src/sys/include/net/ src/sys/include/netif/ - src/sys/include/objgfx/ src/sys/include/pci/ src/sys/include/sde/ src/sys/include/sys/ diff --git a/doc/xml/directory_8c.xml b/doc/xml/directory_8c.xml index f049c10..ba862d9 100644 --- a/doc/xml/directory_8c.xml +++ b/doc/xml/directory_8c.xml @@ -10,170 +10,168 @@ lib/kprintf.h lib/string.h - + sys/thread.h - + - + ubixos/sched.h - + - + - + - + - + - + - + src/sys/ubixfs/directory.c - + - + - + - + - + - + - + - + ubixos/types.h - + - + sys/_types.h - + lib/string.h - + - + vfs/file.h - + - + - + - + sys/tss.h - + - + lib/kmalloc.h - + - + mpi/mpi.h - + - + - + vfs/vfs.h - + - + - + - + - + - + vfs/mount.h - - - + - + lib/kprintf.h - + - + ubixfs/ubixfs.h - + - + - + - + - + - + ubixfs/dirCache.h - + - + sys/sysproto.h - + - + - + ubixos/elf.h - + - + sys/signal.h - + - + ubixos/tty.h - + - + sys/device.h - + @@ -257,18 +255,18 @@ directoryEntry::attributes ubixFSInfo::blockAllocationTable blockSize - vfs_mountPoint::device + vfs_mountPoint::device device_node::devInfo - vfs_mountPoint::diskLabel + vfs_mountPoint::diskLabel directoryEntry::fileName - vfs_mountPoint::fsInfo + vfs_mountPoint::fsInfo getFreeBlocks device_interface::info kfree kmalloc fileDescriptorStruct::mp - vfs_mountPoint::partition - ubixDiskLabel::partitions + vfs_mountPoint::partition + ubixDiskLabel::partitions directoryEntry::permissions blockAllocationTableEntry::realSector directoryEntry::size @@ -422,7 +420,7 @@ fd->mp->device->devInfo->write(fd->mp->device->devInfo->info, dir, -fd->mp->diskLabel->partitions[fd->mp->partition].pOffset+fsInfo->blockAllocationTable[block].realSector, +fd->mp->diskLabel->partitions[fd->mp->partition].pOffset+fsInfo->blockAllocationTable[block].realSector, blockSize); addDirEntry(entry,fd); kfree(dir); diff --git a/doc/xml/divdi3_8c.xml b/doc/xml/divdi3_8c.xml index 6f87a4c..753ed54 100644 --- a/doc/xml/divdi3_8c.xml +++ b/doc/xml/divdi3_8c.xml @@ -4,26 +4,26 @@ divdi3.c math.h - + src/sys/lib/divdi3.c - + - + ubixos/types.h - + - + sys/_types.h - + math.h - + diff --git a/doc/xml/dma_8c.xml b/doc/xml/dma_8c.xml index e7d7c08..08e462b 100644 --- a/doc/xml/dma_8c.xml +++ b/doc/xml/dma_8c.xml @@ -6,33 +6,33 @@ sys/io.h ubixos/types.h - + sys/dma.h - + - + ubixos/types.h - + - + sys/_types.h - + src/sys/sys/dma.c - + - + - + - + sys/io.h diff --git a/doc/xml/dma_8h.xml b/doc/xml/dma_8h.xml index 7f345db..6de1ab2 100644 --- a/doc/xml/dma_8h.xml +++ b/doc/xml/dma_8h.xml @@ -6,37 +6,37 @@ src/sys/isa/fdc.c src/sys/sys/dma.c - + src/sys/include/sys/dma.h - + - + ubixos/types.h - + - + sys/_types.h - + src/sys/include/sys/dma.h - + - + - + src/sys/sys/dma.c - + src/sys/isa/fdc.c diff --git a/doc/xml/driver_8h.xml b/doc/xml/driver_8h.xml index a28d07f..3945cff 100644 --- a/doc/xml/driver_8h.xml +++ b/doc/xml/driver_8h.xml @@ -4,20 +4,20 @@ driver.h ubixos/types.h - + ubixos/types.h - + - + sys/_types.h - + src/sys/include/sys/driver.h - + diff --git a/doc/xml/elf_8c.xml b/doc/xml/elf_8c.xml index 75a3995..99e8ab2 100644 --- a/doc/xml/elf_8c.xml +++ b/doc/xml/elf_8c.xml @@ -4,26 +4,26 @@ elf.c ubixos/elf.h - + src/sys/kernel/elf.c - + - + ubixos/types.h - + - + sys/_types.h - + ubixos/elf.h - + @@ -44,7 +44,7 @@ - elfPhType + elfPhType phTypeName @@ -63,7 +63,7 @@ - elfRelType + elfRelType relTypeName kmod_load ldEnable @@ -84,14 +84,14 @@ - elfShType + elfShType shTypeName - - @10 - struct @10 elfPhType[] + + @4 + struct @4 elfPhType[] [] elfPhType @@ -103,9 +103,9 @@ elfGetPhType - - @12 - struct @12 elfRelType[] + + @6 + struct @6 elfRelType[] [] elfRelType @@ -117,9 +117,9 @@ elfGetRelType - - @11 - struct @11 elfShType[] + + @5 + struct @5 elfShType[] [] elfShType @@ -131,9 +131,9 @@ elfGetShType - - @9 - struct @9 elfType[] + + @3 + struct @3 elfType[] [] elfType @@ -291,7 +291,7 @@ conststruct{ char*elfTypeName; uInt32id; -}elfType[]={ +}elfType[]={ {"ET_NONE",0}, {"ET_REL",1}, {"ET_EXEC",2}, @@ -304,7 +304,7 @@ conststruct{ char*phTypeName; uInt32id; -}elfPhType[]={ +}elfPhType[]={ {"PT_NULL",0}, {"PT_LOAD",1}, {"PT_DYNAMIC",2}, @@ -319,7 +319,7 @@ conststruct{ char*shTypeName; uInt32id; -}elfShType[]={ +}elfShType[]={ {"SHT_NULL",0}, {"SHT_PROGBITS",1}, {"SHT_SYMTAB",2}, @@ -337,7 +337,7 @@ conststruct{ char*relTypeName; uInt32id; -}elfRelType[]={ +}elfRelType[]={ {"R_386_NONE",0}, {"R_386_32",1}, {"R_386_PC32",2}, @@ -353,15 +353,15 @@ char*elfGetShType(intshType){ -return((char*)elfShType[shType].shTypeName); +return((char*)elfShType[shType].shTypeName); } char*elfGetPhType(intphType){ -return((char*)elfPhType[phType].phTypeName); +return((char*)elfPhType[phType].phTypeName); } char*elfGetRelType(intrelType){ -return((char*)elfRelType[relType].relTypeName); +return((char*)elfRelType[relType].relTypeName); } /*** diff --git a/doc/xml/elf_8h.xml b/doc/xml/elf_8h.xml index eb92ae7..6ed2632 100644 --- a/doc/xml/elf_8h.xml +++ b/doc/xml/elf_8h.xml @@ -9,431 +9,395 @@ src/sys/kernel/syscall.c src/sys/kmods/kmod.c - + ubixos/types.h - + - + sys/_types.h - + src/sys/include/ubixos/elf.h - + - + src/sys/include/ubixos/sched.h - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - + - + src/sys/pci/hd.c - + src/sys/include/ubixos/endtask.h - + - + - + - + - + - + - + - + - - - + - - src/sys/net/net/sys_arch.c - - - + src/sys/kernel/vitals.c - + src/sys/kernel/elf.c - + src/sys/mpi/message.c - + src/sys/kmods/kmod.c - + src/sys/mpi/system.c - + src/sys/kernel/kern_sysctl.c - + src/sys/include/ubixos/vitals.h - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + src/sys/lib/kmalloc.c - + src/sys/vmm/paging.c - + src/sys/ubixfs/directory.c - + src/sys/kernel/kern_sig.c - + src/sys/kernel/ubthread.c - + src/sys/kernel/systemtask.c - - src/sys/net/netif/ethernetif.c - - - + src/sys/lib/ogprintf.cc - + src/sys/kernel/ld.c - + src/sys/kernel/fork.c - - src/sys/net/api/tcpip.c - - - + src/sys/ubixfs/block.c - + src/sys/kernel/sched.c - - src/sys/net/net/shell.c - - - + src/sys/include/mpi/mpi.h - + - + - + - + - + - + src/sys/include/ubixos/fork.h - - - + - + src/sys/ubixfs/dirCache.c - + src/sys/ubixfs/ubixfs.c - - src/sys/net/net/init.c - - - + src/sys/init/main.c - + src/sys/include/ubixfs/ubixfs.h - + - + - + - + - + - + - + - + - + src/sys/kernel/bioscall.c - + src/sys/include/ubixos/ubthread.h - + - - - + - + src/sys/kernel/syscall.c - + src/sys/isa/ne2k.c - + src/sys/include/ubixos/exec.h - + - + - + - + - + - - - - - + - + src/sys/include/ubixos/syscalls.h - + - + src/sys/include/pci/hd.h - + - + - + src/sys/isa/atkbd.c - + src/sys/vmm/pagefault.c - + src/sys/ubixfs/thread.c - + src/sys/include/ubixos/init.h - - + + - + src/sys/vfs/mount.c - + src/sys/kernel/time.c - + src/sys/vmm/vmm_memory.c - + src/sys/kernel/spinlock.c - + src/sys/include/ubixos/elf.h - + - + - + - + - + - + src/sys/kernel/kern_descrip.c - + src/sys/kernel/endtask.c - + src/sys/vfs/file.c - + src/sys/kernel/gen_calls.c - + src/sys/sys/idt.c - + src/sys/kernel/syscall_new.c - + src/sys/kernel/exec.c - + src/sys/vmm/getfreevirtualpage.c - + src/sys/vfs/vfs.c @@ -1015,7 +979,7 @@ - elfPhType + elfPhType phTypeName @@ -1033,7 +997,7 @@ - elfRelType + elfRelType relTypeName kmod_load ldEnable @@ -1053,7 +1017,7 @@ - elfShType + elfShType shTypeName diff --git a/doc/xml/endtask_8c.xml b/doc/xml/endtask_8c.xml index 3ea3dac..3a1ba53 100644 --- a/doc/xml/endtask_8c.xml +++ b/doc/xml/endtask_8c.xml @@ -9,186 +9,184 @@ lib/kprintf.h isa/8259.h - + sys/thread.h - + - + ubixos/sched.h - + - + - + - + - + - + - + ubixos/vitals.h - + - + - + - + - + ubixos/types.h - + - + sys/_types.h - + vmm/paging.h - + - + - + - + ubixos/time.h - + - + - + vfs/file.h - + - + - + - + sys/tss.h - + - + vmm/vmm.h - + - + - + vfs/vfs.h - + - + - + - + - + - + vfs/mount.h - - - + - + lib/kprintf.h - + - + ubixos/ubthread.h - + - + - + - + ubixfs/dirCache.h - + - + sys/sysproto.h - + - + - + ubixos/elf.h - + - + sys/signal.h - + - + src/sys/kernel/endtask.c - + - + - + - + - + - + - + ubixos/tty.h - + - + sys/io.h - + isa/8259.h - + @@ -226,7 +224,6 @@ _int5 _int6 _int9 - netMainThread schedEndTask sysExec sysExit diff --git a/doc/xml/endtask_8h.xml b/doc/xml/endtask_8h.xml index f891d45..51f1834 100644 --- a/doc/xml/endtask_8h.xml +++ b/doc/xml/endtask_8h.xml @@ -12,182 +12,145 @@ src/sys/kernel/sched.c src/sys/kernel/syscall.c src/sys/kernel/syscall_new.c - src/sys/net/net/init.c src/sys/sys/idt.c - + sys/thread.h - + - + ubixos/sched.h - + - + - + - + - + - + - + src/sys/include/ubixos/endtask.h - + - + - + ubixos/types.h - + - + sys/_types.h - + vfs/file.h - + - + - + - + sys/tss.h - + - - vfs/vfs.h - - - - - - - - - - - - - + vfs/mount.h - - - + - + ubixfs/dirCache.h - + - - sys/sysproto.h - - - - - - - + ubixos/elf.h - + - - sys/signal.h - - - - - + ubixos/tty.h - + - + src/sys/include/ubixos/endtask.h - + - + - + - + - + - + - + - + - - - + - + src/sys/kernel/kern_sysctl.c - + src/sys/kernel/kern_sig.c - + src/sys/kernel/sched.c - - src/sys/net/net/init.c - - - + src/sys/kernel/syscall.c - + src/sys/isa/atkbd.c - + src/sys/kernel/kern_descrip.c - + src/sys/sys/idt.c - + src/sys/kernel/syscall_new.c - + src/sys/kernel/exec.c @@ -225,7 +188,6 @@ _int5 _int6 _int9 - netMainThread schedEndTask sysExec sysExit diff --git a/doc/xml/ethernetif_8h.xml b/doc/xml/ethernetif_8h.xml index 0f761b5..4a1366a 100644 --- a/doc/xml/ethernetif_8h.xml +++ b/doc/xml/ethernetif_8h.xml @@ -2,118 +2,18 @@ ethernetif.h - net/netif.h - src/sys/net/net/init.c + net/netif.h - + net/netif.h - - - - - - - - - - - - - arch/cpu.h - - - - ubixos/types.h - - - - - - sys/_types.h - - - - net/arch.h - - - - - - - - net/lwipopts.h - - - + src/sys/include/netif/ethernetif.h - + - - net/ipv4/ip_addr.h - - - - - - net/err.h - - - - - - - - - - net/opt.h - - - - - - net/pbuf.h - - - - - - - - net/debug.h - - - - net/ipv4/inet.h - - - - - - - - - - - - net/arch/cc.h - - - - - src/sys/include/netif/ethernetif.h - - - - - - src/sys/net/net/init.c - - - void @@ -121,7 +21,7 @@ (struct netif *netif) ethernetif_init - struct netif * + struct netif * netif @@ -130,24 +30,7 @@ - - arp_init - arp_timer - ARP_TMR_INTERVAL - ethernetif_output - netif::hwaddr - IFNAME0 - IFNAME1 - netif::linkoutput - low_level_init - low_level_output - mem_malloc - netif::name - NULL - netif::output - netif::state - sys_timeout - netMainThread + @@ -192,9 +75,9 @@ #ifndef__NETIF_ETHERNETIF_H__ #define__NETIF_ETHERNETIF_H__ -#include"net/netif.h" +#include"net/netif.h" -voidethernetif_init(structnetif*netif); +voidethernetif_init(structnetif*netif); #endif/*__NETIF_ETHERNETIF_H__*/ diff --git a/doc/xml/exec_8c.xml b/doc/xml/exec_8c.xml index 127d540..9b27a37 100644 --- a/doc/xml/exec_8c.xml +++ b/doc/xml/exec_8c.xml @@ -13,196 +13,180 @@ lib/string.h assert.h - + sys/thread.h - + - + ubixos/kpanic.h - + ubixos/sched.h - + - + - + - + - + - + - + ubixos/endtask.h - + - + - + ubixos/types.h - + - + sys/_types.h - + lib/string.h - + - + vmm/paging.h - + - + - + - + vfs/file.h - + - + - + - + sys/tss.h - + - + lib/kmalloc.h - + - + vmm/vmm.h - + - + - - vfs/vfs.h - - - - - - - - - - - - - + vfs/mount.h - - - + - + lib/kprintf.h - + - + ubixos/ld.h - + - + assert.h - + ubixfs/dirCache.h - + - + ubixos/exec.h - + - + - + sys/sysproto.h - + - + - + ubixos/elf.h - + - + sys/signal.h - + - + ubixos/tty.h - + - + src/sys/kernel/exec.c - + - + - + - + - + - + - + - + - + - + diff --git a/doc/xml/exec_8h.xml b/doc/xml/exec_8h.xml index c5dfe30..b2509f9 100644 --- a/doc/xml/exec_8h.xml +++ b/doc/xml/exec_8h.xml @@ -9,171 +9,127 @@ src/sys/kernel/syscall.c src/sys/kernel/systemtask.c src/sys/kernel/ubthread.c - src/sys/net/api/tcpip.c - src/sys/net/net/init.c src/sys/ubixfs/ubixfs.c - + sys/thread.h - + - + ubixos/sched.h - + - + - + - + - + - + - + ubixos/types.h - + - + sys/_types.h - + vfs/file.h - + - + - + - + sys/tss.h - + - - vfs/vfs.h - - - - - - - - - - - - - + vfs/mount.h - - - + - + ubixfs/dirCache.h - + - + src/sys/include/ubixos/exec.h - + - + - - sys/sysproto.h - - - - - - - + ubixos/elf.h - + - - sys/signal.h - - - - - + ubixos/tty.h - + - + src/sys/kernel/ubthread.c - + src/sys/kernel/systemtask.c - - src/sys/net/api/tcpip.c - - - + src/sys/ubixfs/ubixfs.c - - src/sys/net/net/init.c - - - + src/sys/init/main.c - + src/sys/kernel/syscall.c - + src/sys/include/ubixos/exec.h - + - + - + - + - + - - - - - + - + src/sys/kernel/exec.c diff --git a/doc/xml/fdc_8c.xml b/doc/xml/fdc_8c.xml index ccd06d0..09d7c4a 100644 --- a/doc/xml/fdc_8c.xml +++ b/doc/xml/fdc_8c.xml @@ -16,174 +16,138 @@ lib/kmalloc.h devfs/devfs.h - - sys/thread.h - - - - - + ubixos/spinlock.h - + - + sys/dma.h - + - + devfs/devfs.h - + - + - + ubixos/types.h - + - + sys/_types.h - + sys/video.h - + - + vfs/file.h - + - + - + - + lib/kmalloc.h - + - + sys/idt.h - + - + - - vfs/vfs.h - - - - - - - - - - - - - + vfs/mount.h - - - + - + lib/kprintf.h - + - + sys/gdt.h - + ubixfs/dirCache.h - + - + isa/fdc.h - + - - sys/sysproto.h - - - - - - - - sys/signal.h - - - - - + sys/io.h - + isa/8259.h - + - + src/sys/isa/fdc.c - + - + - + - + - + - + - + - + - + - + - + - + - + - + sys/device.h - + @@ -258,7 +222,7 @@ fdcWrite floppyIsr device_interface::init - irqEnable + irqEnable kmalloc device_interface::major mVec @@ -284,7 +248,8 @@ - dev + device_node::devInfo + device_interface::size fdc_init @@ -935,8 +900,8 @@ unsignedlongtbaddr=0x80000L; -intfdcInit2(structdevice_node*dev){ -dev->devInfo->size=(1024*1450); +intfdcInit2(structdevice_node*dev){ +dev->devInfo->size=(1024*1450); return(0x0); } diff --git a/doc/xml/fdc_8h.xml b/doc/xml/fdc_8h.xml index 7108519..9b0f175 100644 --- a/doc/xml/fdc_8h.xml +++ b/doc/xml/fdc_8h.xml @@ -3,46 +3,46 @@ fdc.h ubixos/types.h - src/sys/include/ubixos/init.h + src/sys/include/ubixos/init.h src/sys/isa/fdc.c - + ubixos/types.h - + - + sys/_types.h - + src/sys/include/isa/fdc.h - + - + src/sys/init/main.c - + src/sys/include/ubixos/init.h - - + + - + src/sys/include/isa/fdc.h - + - + - + src/sys/isa/fdc.c @@ -326,7 +326,7 @@ fdcWrite floppyIsr device_interface::init - irqEnable + irqEnable kmalloc device_interface::major mVec diff --git a/doc/xml/ffs_8c.xml b/doc/xml/ffs_8c.xml index 5757f48..430f842 100644 --- a/doc/xml/ffs_8c.xml +++ b/doc/xml/ffs_8c.xml @@ -11,150 +11,148 @@ lib/string.h sys/buf.h - + src/sys/ufs/ffs.c - + - + - + - + - + - + - + - + - + ufs/ufs.h - + - + - + - + sys/thread.h - + - + ubixos/kpanic.h - + ufs/ffs.h - + - + - + - + ubixos/types.h - + - + sys/_types.h - + lib/string.h - + - + vfs/file.h - + - + - + - + lib/kmalloc.h - + - + vfs/vfs.h - + - + - + - + - + - + vfs/mount.h - - - + - + lib/kprintf.h - + - + ubixfs/dirCache.h - + - + sys/sysproto.h - + - + - + sys/signal.h - + - + sys/buf.h - + - + - + - + sys/device.h - + @@ -190,7 +188,7 @@ fileDescriptorStruct::dmadat fs::fs_maxfilesize kprintf - dmadat::sbbuf + dmadat::sbbuf @@ -211,7 +209,7 @@ intffs_read(fileDescriptor*fd,char*data,uInt32offset,longsize){ structfs*fs; -fs=(structfs*)fd->dmadat->sbbuf; +fs=(structfs*)fd->dmadat->sbbuf; if(offset<fd->size&&offset>=fs->fs_maxfilesize){ //return(EOVERFLOW); diff --git a/doc/xml/ffs_8h.xml b/doc/xml/ffs_8h.xml index b90f9cc..bb23f0a 100644 --- a/doc/xml/ffs_8h.xml +++ b/doc/xml/ffs_8h.xml @@ -8,105 +8,103 @@ src/sys/ufs/ffs.c src/sys/ufs/ufs.c - + sys/thread.h - + - + src/sys/include/ufs/ffs.h - + - + - + - + ubixos/types.h - + - + sys/_types.h - + vfs/file.h - + - + - + - + vfs/vfs.h - + - + - + - + - + - + vfs/mount.h - - - + - + ubixfs/dirCache.h - + - + sys/sysproto.h - + - + - + sys/signal.h - + - + sys/device.h - + - + src/sys/ufs/ffs.c - + src/sys/include/ufs/ffs.h - + - + - + src/sys/ufs/ufs.c @@ -139,7 +137,7 @@ fileDescriptorStruct::dmadat fs::fs_maxfilesize kprintf - dmadat::sbbuf + dmadat::sbbuf diff --git a/doc/xml/file_8c.xml b/doc/xml/file_8c.xml index 57a1eff..4232f3c 100644 --- a/doc/xml/file_8c.xml +++ b/doc/xml/file_8c.xml @@ -14,208 +14,206 @@ lib/kprintf.h assert.h - + sys/thread.h - + - + ubixos/kpanic.h - + ubixos/sched.h - + - + - + - + - + - + - + ubixos/spinlock.h - + - + ubixos/vitals.h - + - + - + - + - + ubixos/types.h - + - + sys/_types.h - + lib/string.h - + - + vmm/paging.h - + - + - + - + ubixos/time.h - + - + - + vfs/file.h - + - + - + - + sys/tss.h - + - + lib/kmalloc.h - + - + vfs/vfs.h - + - + - + - + - + - + vfs/mount.h - - - + - + lib/kprintf.h - + - + assert.h - + ubixos/ubthread.h - + - + - + - + ubixfs/dirCache.h - + - + sys/sysproto.h - + - + - + ubixos/elf.h - + - + sys/signal.h - + - + ubixos/tty.h - + - + sys/io.h - + src/sys/vfs/file.c - + - + - + - + - + - + - + - + - + - + - + @@ -242,7 +240,7 @@ fdTable_lock kfree fileDescriptorStruct::next - NULL + NULL vitalsStruct::openFiles fileDescriptorStruct::prev spinLock @@ -292,7 +290,7 @@ - vfs_mountPoint::fs + vfs_mountPoint::fs fileDescriptorStruct::mp fileDescriptorStruct::offset fileSystem::vfsRead @@ -327,14 +325,14 @@ fileDescriptorStruct::fileName fileRead fileWrite - vfs_mountPoint::fs + vfs_mountPoint::fs kfree kmalloc kprintf fileDescriptorStruct::mode fileDescriptorStruct::mp fileDescriptorStruct::next - NULL + NULL fileDescriptorStruct::offset vitalsStruct::openFiles fileDescriptorStruct::prev @@ -355,7 +353,6 @@ sysExec sysFopen sysMkDir - tcpdump_init int @@ -377,7 +374,7 @@ - vfs_mountPoint::fs + vfs_mountPoint::fs fileDescriptorStruct::mp fileDescriptorStruct::offset fileSystem::vfsWrite @@ -411,7 +408,7 @@ assert - vfs_mountPoint::fs + vfs_mountPoint::fs fileDescriptorStruct::mp fileDescriptorStruct::offset fileSystem::vfsRead @@ -480,7 +477,7 @@ - vfs_mountPoint::fs + vfs_mountPoint::fs fileDescriptorStruct::mp fileDescriptorStruct::offset fileSystem::vfsWrite @@ -530,7 +527,7 @@ fclose userFileDescriptorStruct::fd - NULL + NULL void @@ -588,7 +585,7 @@ userFileDescriptorStruct::fdSize fopen kprintf - NULL + NULL fileDescriptorStruct::size @@ -617,7 +614,7 @@ userFileDescriptorStruct::fd fread - NULL + NULL void @@ -644,7 +641,7 @@ userFileDescriptorStruct::fd - NULL + NULL fileDescriptorStruct::offset @@ -697,10 +694,10 @@ osInfo::cwd fclose fopen - vfs_mountPoint::fs + vfs_mountPoint::fs kprintf fileDescriptorStruct::mp - NULL + NULL taskStruct::oInfo sprintf strstr @@ -758,9 +755,9 @@ - vfs_mountPoint::fs - vfs_mountPoint::mountPoint - NULL + vfs_mountPoint::fs + vfs_mountPoint::mountPoint + NULL strtok vfs_findMount fileSystem::vfsUnlink @@ -899,9 +896,9 @@ voidsysFseek(userFileDescriptor*userFd,longoffset,intwhence){ //TODO:coredump? -if(userFd==NULL) +if(userFd==NULL) return; -if(userFd->fd==NULL) +if(userFd->fd==NULL) return; userFd->fd->offset=offset+whence; @@ -928,7 +925,7 @@ ************************************************************************/ voidsysFopen(constchar*file,char*flags,userFileDescriptor*userFd){ -if(userFd==NULL) +if(userFd==NULL) kprintf("Error:userFd==NULL,File:%s,Line:%i\n",__FILE__,__LINE__); userFd->fd=fopen(file,flags); if(userFd->fd!=0x0){ @@ -947,9 +944,9 @@ ************************************************************************/ voidsysFread(void*data,longsize,userFileDescriptor*userFd){ /*TODO:coredump?*/ -if(userFd==NULL) +if(userFd==NULL) return; -if(userFd->fd==NULL) +if(userFd->fd==NULL) return; fread(data,size,1,userFd->fd); return; @@ -963,12 +960,12 @@ ************************************************************************/ voidsysFclose(userFileDescriptor*userFd,int*status){ -if(userFd==NULL) +if(userFd==NULL) { *status=-1; return; } -if(userFd->fd==NULL) +if(userFd->fd==NULL) { *status=-1; return; @@ -1089,14 +1086,14 @@ /*AllocateMemoryForFileDescriptor*/ if((tmpFd=(fileDescriptor*)kmalloc(sizeof(fileDescriptor)))==0x0){ kprintf("Error:tmpFd==NULL,File:%s,Line:%i\n",__FILE__,__LINE__); -return(NULL); +return(NULL); } strcpy(fileName,file); if(strstr(fileName,":")){ mountPoint=(char*)strtok((char*)&fileName,":"); -path=strtok(NULL,"\n"); +path=strtok(NULL,"\n"); } else{ path=fileName; @@ -1189,7 +1186,7 @@ kfree(tmpFd); spinUnlock(&fdTable_lock); kprintf("FileNotFound?%s\n",file); -return(NULL); +return(NULL); } /*ReturnNULL*/ @@ -1221,7 +1218,7 @@ systemVitals->openFiles--; spinUnlock(&fdTable_lock); -if(tmpFd->buffer!=NULL) +if(tmpFd->buffer!=NULL) kfree(tmpFd->buffer); kfree(tmpFd); return(0x0); @@ -1259,7 +1256,7 @@ sprintf(rootPath,"%s/",strtok(dir,"/")); else sprintf(rootPath,"%s%s/",rootPath,strtok(dir,"/")); -tmp=strtok(NULL,"\n"); +tmp=strtok(NULL,"\n"); dir=tmp; } @@ -1290,7 +1287,7 @@ structvfs_mountPoint*mp=0x0; path=(char*)strtok((char*)node,"@"); -mountPoint=strtok(NULL,"\n"); +mountPoint=strtok(NULL,"\n"); if(mountPoint==0x0){ mp=vfs_findMount("sys");/*_current->oInfo.container;*/ } diff --git a/doc/xml/fork_8c.xml b/doc/xml/fork_8c.xml index 55695a7..2601115 100644 --- a/doc/xml/fork_8c.xml +++ b/doc/xml/fork_8c.xml @@ -11,195 +11,193 @@ string.h assert.h - + sys/thread.h - + - + ubixos/sched.h - + - + - + - + - + - + - + ubixos/vitals.h - + - + - + - + - + ubixos/types.h - + - + sys/_types.h - + vmm/paging.h - + - + - + - + string.h - + - + ubixos/time.h - + - + - + vfs/file.h - + - + - + - + src/sys/kernel/fork.c - + - + - + - + - + - + - + - + - + sys/tss.h - + - + vmm/vmm.h - + - + - + ubixos/fork.h - + - + - + vfs/vfs.h - + - + - + - + - + - + vfs/mount.h - - - + - + assert.h - + ubixos/ubthread.h - + - + - + - + ubixfs/dirCache.h - + - + sys/sysproto.h - + - + - + ubixos/elf.h - + - + sys/signal.h - + - + ubixos/tty.h - + - + sys/io.h diff --git a/doc/xml/fork_8h.xml b/doc/xml/fork_8h.xml index ea8fbe6..d369705 100644 --- a/doc/xml/fork_8h.xml +++ b/doc/xml/fork_8h.xml @@ -5,134 +5,97 @@ ubixos/types.h ubixos/sched.h src/sys/kernel/fork.c - src/sys/net/net/shell.c - + sys/thread.h - + - + ubixos/sched.h - + - + - + - + - + - + - + ubixos/types.h - + - + sys/_types.h - + vfs/file.h - + - + - + - + sys/tss.h - + - + src/sys/include/ubixos/fork.h - + - + - - vfs/vfs.h - - - - - - - - - - - - - + vfs/mount.h - - - + - + ubixfs/dirCache.h - + - - sys/sysproto.h - - - - - - - + ubixos/elf.h - + - - sys/signal.h - - - - - + ubixos/tty.h - + - + src/sys/kernel/fork.c - - src/sys/net/net/shell.c - - - + src/sys/include/ubixos/fork.h - - - + diff --git a/doc/xml/gdt_8h.xml b/doc/xml/gdt_8h.xml index 710bd10..bed2022 100644 --- a/doc/xml/gdt_8h.xml +++ b/doc/xml/gdt_8h.xml @@ -11,81 +11,81 @@ src/sys/pci/lnc.c src/sys/sys/idt.c - + src/sys/pci/lnc.c - + src/sys/kernel/sched.c - + src/sys/include/sys/idt.h - + - + - + - + - + - + - + - + - + src/sys/init/main.c - + src/sys/include/sys/gdt.h - + - + - + - + - + - + - + - + - + src/sys/isa/ne2k.c - + src/sys/isa/atkbd.c - + src/sys/include/ubixos/init.h - - + + - + src/sys/sys/idt.c - + src/sys/isa/fdc.c - + src/sys/isa/mouse.c diff --git a/doc/xml/gen__calls_8c.xml b/doc/xml/gen__calls_8c.xml index 5f8bd84..f1008b7 100644 --- a/doc/xml/gen__calls_8c.xml +++ b/doc/xml/gen__calls_8c.xml @@ -12,168 +12,152 @@ string.h assert.h - + sys/thread.h - + - + ubixos/sched.h - + - + - + - + - + - + - + ubixos/types.h - + - + sys/_types.h - + string.h - + - + vfs/file.h - + - + - + - + sys/tss.h - + - + lib/kmalloc.h - + - + sys/gen_calls.h - + - + - - vfs/vfs.h - - - - - - - - - - - - - + vfs/mount.h - - - + - + lib/kprintf.h - + - + sys/kern_descrip.h - + - + - + - + assert.h - + ubixfs/dirCache.h - + - + sys/sysproto.h - + - + - + ubixos/elf.h - + - + sys/signal.h - + - + ubixos/tty.h - + - + src/sys/kernel/gen_calls.c - + - + - + - + - + - + - + - + - + @@ -398,7 +382,6 @@ write_args::buf - buffer write_args::fd kfree kmalloc @@ -481,7 +464,7 @@ } intsys_write(structthread*td,structwrite_args*uap){ -char*buffer=0x0; +char*buffer=0x0; char*in=0x0; #ifdefDEBUG diff --git a/doc/xml/gen__calls_8h.xml b/doc/xml/gen__calls_8h.xml index 7869c0b..3b941fb 100644 --- a/doc/xml/gen__calls_8h.xml +++ b/doc/xml/gen__calls_8h.xml @@ -6,53 +6,53 @@ sys/sysproto.h src/sys/kernel/gen_calls.c - + sys/thread.h - + - + ubixos/types.h - + - + sys/_types.h - + src/sys/include/sys/gen_calls.h - + - + - + sys/sysproto.h - + - + - + sys/signal.h - + - + src/sys/include/sys/gen_calls.h - + - + src/sys/kernel/gen_calls.c diff --git a/doc/xml/getfreepage_8c.xml b/doc/xml/getfreepage_8c.xml index a8c7631..a6763d8 100644 --- a/doc/xml/getfreepage_8c.xml +++ b/doc/xml/getfreepage_8c.xml @@ -6,72 +6,72 @@ ubixos/kpanic.h ubixos/spinlock.h - + sys/thread.h - + - + ubixos/kpanic.h - + ubixos/spinlock.h - + - + ubixos/types.h - + - + sys/_types.h - + vmm/paging.h - + - + - + - + vmm/vmm.h - + - + - + sys/sysproto.h - + - + - + sys/signal.h - + - + src/sys/vmm/getfreepage.c - + - + - + diff --git a/doc/xml/getfreevirtualpage_8c.xml b/doc/xml/getfreevirtualpage_8c.xml index e0c149b..2a53a77 100644 --- a/doc/xml/getfreevirtualpage_8c.xml +++ b/doc/xml/getfreevirtualpage_8c.xml @@ -8,154 +8,138 @@ ubixos/spinlock.h lib/kprint.h - + sys/thread.h - + - + ubixos/kpanic.h - + ubixos/sched.h - + - + - + - + - + - + - + ubixos/spinlock.h - + - + ubixos/types.h - + - + sys/_types.h - + vmm/paging.h - + - + - + - + vfs/file.h - + - + - + - + sys/tss.h - + - + lib/kprint.h - + - + vmm/vmm.h - + - + - - vfs/vfs.h - - - - - - - - - - - - - + vfs/mount.h - - - + - + ubixfs/dirCache.h - + - + sys/sysproto.h - + - + - + ubixos/elf.h - + - + sys/signal.h - + - + ubixos/tty.h - + - + src/sys/vmm/getfreevirtualpage.c - + - + - + - + - + diff --git a/doc/xml/getphysicaladdr_8c.xml b/doc/xml/getphysicaladdr_8c.xml index 72916af..8ed75e3 100644 --- a/doc/xml/getphysicaladdr_8c.xml +++ b/doc/xml/getphysicaladdr_8c.xml @@ -4,58 +4,58 @@ getphysicaladdr.c vmm/vmm.h - + sys/thread.h - + - + ubixos/types.h - + - + sys/_types.h - + vmm/paging.h - + - + - + - + vmm/vmm.h - + - + - + src/sys/vmm/getphysicaladdr.c - + - + sys/sysproto.h - + - + - + sys/signal.h - + diff --git a/doc/xml/hd_8c.xml b/doc/xml/hd_8c.xml index 227ca5a..90edb58 100644 --- a/doc/xml/hd_8c.xml +++ b/doc/xml/hd_8c.xml @@ -11,196 +11,194 @@ devfs/devfs.h string.h - + sys/thread.h - + - + ubixos/sched.h - + - + - + - + - + - + - + src/sys/pci/hd.c - + - + - + - + - + - + - + - + - + devfs/devfs.h - + - + - + ubixos/types.h - + - + sys/_types.h - + sys/video.h - + - + string.h - + - + vfs/file.h - + - + - + - + sys/tss.h - + - + lib/kmalloc.h - + - + mpi/mpi.h - + - + - + vfs/vfs.h - + - + - + - + - + - + vfs/mount.h - - - + - + lib/kprintf.h - + - + ubixfs/ubixfs.h - + - + - + - + - + - + ubixfs/dirCache.h - + - + pci/hd.h - + - + sys/sysproto.h - + - + - + ubixos/elf.h - + - + sys/signal.h - + - + ubixos/tty.h - + - + sys/io.h - + sys/device.h - + @@ -221,7 +219,7 @@ - dev + device_node::devInfo hdCmd hdData driveInfo::hdDev @@ -235,10 +233,13 @@ driveInfo::hdShift driveInfo::hdSize hdStat + device_interface::info + device_interface::initialized inportByte inportWord kprintf outportByte + device_interface::size initHardDisk @@ -424,7 +425,7 @@ bsd_disklabel::d_npartitions - bsd_disklabel::d_partitions + bsd_disklabel::d_partitions devfs_makeNode device_add dos_partition::dp_start @@ -566,7 +567,7 @@ //Whydoineedtoadd1? hdRead(devInfo->info,data2,d[i].dp_start+1,0x1); for(x=0;x<bsdd->d_npartitions;x++){ -if(bsdd->d_partitions[x].p_size>0){ +if(bsdd->d_partitions[x].p_size>0){ sprintf(name,"ad0s%i%c",i+1,'a'+x); //NewNodes devInfo2=(structdevice_interface*)kmalloc(sizeof(structdevice_interface)); @@ -574,12 +575,12 @@ memcpy(devInfo2,devInfo,sizeof(structdevice_interface)); memcpy(hdd2,hdd,sizeof(structdriveInfo)); //hdd2->parOffset=d[i].dp_start+bsdd->d_partitions[x].p_offset; -hdd2->parOffset=bsdd->d_partitions[x].p_offset; +hdd2->parOffset=bsdd->d_partitions[x].p_offset; devInfo2->info=hdd2; minor++; device_add(minor,'c',devInfo2); devfs_makeNode(name,'c',0x1,minor); -kprintf("%s-Type:[%s],Start:[0x%X],Size:[0x%X],MM:[%i:%i]\n",name,fstypenames[bsdd->d_partitions[x].p_fstype],bsdd->d_partitions[x].p_offset,bsdd->d_partitions[x].p_size,devInfo->major,minor); +kprintf("%s-Type:[%s],Start:[0x%X],Size:[0x%X],MM:[%i:%i]\n",name,fstypenames[bsdd->d_partitions[x].p_fstype],bsdd->d_partitions[x].p_offset,bsdd->d_partitions[x].p_size,devInfo->major,minor); } } } @@ -611,11 +612,11 @@ return(0x0); } -inthdInit(structdevice_node*dev){ +inthdInit(structdevice_node*dev){ charretVal=0x0; longcounter=0x0; short*tmp=0x0; -structdriveInfo*hdd=dev->devInfo->info; +structdriveInfo*hdd=dev->devInfo->info; for(counter=1000000;counter>=0;counter--){ retVal=inportByte(hdd->hdPort+hdStat)&0x80; if(!retVal)gotoready; @@ -683,8 +684,8 @@ hdd->hdSize=(hdd->hdSector[0x7B]*256*256*256)+(hdd->hdSector[0x7A]*256*256)+(hdd->hdSector[0x79]*256)+hdd->hdSector[0x78]; hdd->hdEnable=1; kprintf("Drive:[0x%X/0x%X],Size:[%iSectors/%iKBytes]\n",hdd->hdPort,hdd->hdDev,hdd->hdSize,((hdd->hdSize*512)/1024)); -dev->devInfo->size=hdd->hdSize*512; -dev->devInfo->initialized=0x1; +dev->devInfo->size=hdd->hdSize*512; +dev->devInfo->initialized=0x1; return(0x0); } diff --git a/doc/xml/hd_8h.xml b/doc/xml/hd_8h.xml index 7da2454..f328487 100644 --- a/doc/xml/hd_8h.xml +++ b/doc/xml/hd_8h.xml @@ -3,167 +3,165 @@ hd.h ubixfs/ubixfs.h - src/sys/include/ubixos/init.h + src/sys/include/ubixos/init.h src/sys/pci/hd.c - + sys/thread.h - + - + ubixos/sched.h - + - + - + - + - + - + - + ubixos/types.h - + - + sys/_types.h - + vfs/file.h - + - + - + - + sys/tss.h - + - + mpi/mpi.h - + - + - + vfs/vfs.h - + - + - + - + - + - + vfs/mount.h - - - + - + ubixfs/ubixfs.h - + - + - + - + - + - + ubixfs/dirCache.h - + - + src/sys/include/pci/hd.h - + - + sys/sysproto.h - + - + - + ubixos/elf.h - + - + sys/signal.h - + - + ubixos/tty.h - + - + sys/device.h - + - + src/sys/pci/hd.c - + src/sys/init/main.c - + src/sys/include/pci/hd.h - + - + - + src/sys/include/ubixos/init.h - - + + @@ -343,7 +341,7 @@ - dev + device_node::devInfo hdCmd hdData driveInfo::hdDev @@ -357,10 +355,13 @@ driveInfo::hdShift driveInfo::hdSize hdStat + device_interface::info + device_interface::initialized inportByte inportWord kprintf outportByte + device_interface::size initHardDisk @@ -540,7 +541,7 @@ bsd_disklabel::d_npartitions - bsd_disklabel::d_partitions + bsd_disklabel::d_partitions devfs_makeNode device_add dos_partition::dp_start @@ -691,7 +692,7 @@ inthdStart(); inthdStop(); inthdStandby(); -inthdInit(structdevice_node*dev); +inthdInit(structdevice_node*dev); structdos_partition{ unsignedchardp_flag;/*bootstrapflags*/ @@ -763,9 +764,9 @@ u_int32_td_trkseek;/*track-to-trackseek,usec*/ u_int32_td_flags;/*genericflags*/ #defineNDDATA5 -u_int32_td_drivedata[NDDATA];/*drive-typespecificinformation*/ +u_int32_td_drivedata[NDDATA];/*drive-typespecificinformation*/ #defineNSPARE5 -u_int32_td_spare[NSPARE];/*reservedforfutureuse*/ +u_int32_td_spare[NSPARE];/*reservedforfutureuse*/ u_int32_td_magic2;/*themagicnumber(again)*/ u_int16_td_checksum;/*xorofdataincl.partitions*/ @@ -780,7 +781,7 @@ u_int8_tp_fstype;/*filesystemtype,seebelow*/ u_int8_tp_frag;/*filesystemfragmentsperblock*/ u_int16_tp_cpg;/*filesystemcylinderspergroup*/ -}d_partitions[MAXPARTITIONS];/*actuallymaybemore*/ +}d_partitions[MAXPARTITIONS];/*actuallymaybemore*/ }; staticconstchar*fstypenames[]={ @@ -805,7 +806,7 @@ "?", "?", "jfs", -NULL +NULL }; #endif diff --git a/doc/xml/idt_8c.xml b/doc/xml/idt_8c.xml index ee904f6..8c36714 100644 --- a/doc/xml/idt_8c.xml +++ b/doc/xml/idt_8c.xml @@ -15,210 +15,194 @@ ubixos/endtask.h string.h - + sys/thread.h - + - + ubixos/kpanic.h - + ubixos/sched.h - + - + - + - + - + - + - + ubixos/endtask.h - + - + - + ubixos/syscall.h - + - + ubixos/types.h - + - + sys/_types.h - + vmm/paging.h - + - + - + - + string.h - + - + vfs/file.h - + - + - + - + sys/tss.h - + - + lib/kmalloc.h - + - + vmm/vmm.h - + - + - + sys/idt.h - + - + - - vfs/vfs.h - - - - - - - - - - - - - + vfs/mount.h - - - + - + lib/kprintf.h - + - + sys/gdt.h - + ubixfs/dirCache.h - + - + sys/sysproto.h - + - + - + ubixos/elf.h - + - + sys/signal.h - + - + ubixos/tty.h - + - + sys/io.h - + src/sys/sys/idt.c - + - + - + - + - + - + - + - + - + - + - + - + - + isa/8259.h - + @@ -363,8 +347,8 @@ taskStruct::id inportByte inportWord - irqDisable - irqEnable + irqDisable + irqEnable kpanic kprintf taskStruct::oInfo @@ -618,7 +602,7 @@ kernelPageDirectory kprintf tssStruct::ldt - loadidt + loadidt memset setTaskVector setVector @@ -751,9 +735,9 @@ - - struct @14 - struct @14 loadidt + + struct @8 + struct @8 loadidt loadidt @@ -820,7 +804,7 @@ staticstruct{ unsignedshortlimit__attribute__((packed)); uniondescriptorTableUnion*idt__attribute__((packed)); -}loadidt={ +}loadidt={ (256*sizeof(uniondescriptorTableUnion)-1),ubixIDT }; @@ -854,7 +838,7 @@ "popfl\n" "sti\n" : -:"r"((char*)&loadidt) +:"r"((char*)&loadidt) ); /*Setupthebasicvectorsforthereservedints*/ diff --git a/doc/xml/idt_8h.xml b/doc/xml/idt_8h.xml index e494121..2104650 100644 --- a/doc/xml/idt_8h.xml +++ b/doc/xml/idt_8h.xml @@ -4,7 +4,7 @@ idt.h ubixos/types.h sys/gdt.h - src/sys/include/ubixos/init.h + src/sys/include/ubixos/init.h src/sys/isa/atkbd.c src/sys/isa/fdc.c src/sys/isa/mouse.c @@ -13,85 +13,85 @@ src/sys/pci/lnc.c src/sys/sys/idt.c - + ubixos/types.h - + - + sys/_types.h - + src/sys/include/sys/idt.h - + - + - + sys/gdt.h - + src/sys/pci/lnc.c - + src/sys/kernel/sched.c - + src/sys/include/sys/idt.h - + - + - + - + - + - + - + - + - + src/sys/init/main.c - + src/sys/isa/ne2k.c - + src/sys/isa/atkbd.c - + src/sys/include/ubixos/init.h - - + + - + src/sys/sys/idt.c - + src/sys/isa/fdc.c - + src/sys/isa/mouse.c @@ -267,8 +267,8 @@ taskStruct::id inportByte inportWord - irqDisable - irqEnable + irqDisable + irqEnable kpanic kprintf taskStruct::oInfo @@ -499,7 +499,7 @@ kernelPageDirectory kprintf tssStruct::ldt - loadidt + loadidt memset setTaskVector setVector diff --git a/doc/xml/index.xml b/doc/xml/index.xml index 577f473..33d3dd8 100644 --- a/doc/xml/index.xml +++ b/doc/xml/index.xml @@ -1,7 +1,7 @@ __sigset - __bits + __bits __timespec tv_nsec @@ -24,40 +24,6 @@ uid username - api_msg - msg - type - - api_msg_msg - bc - conn - conntype - copy - dataptr - ipaddr - len - mbox - msg - p - port - w - - arp_entry - ctime - ethaddr - ipaddr - - arp_hdr - PACK_STRUCT_FIELD - PACK_STRUCT_FIELD - PACK_STRUCT_FIELD - PACK_STRUCT_FIELD - PACK_STRUCT_FIELD - PACK_STRUCT_FIELD - PACK_STRUCT_FIELD - PACK_STRUCT_FIELD - PACK_STRUCT_FIELD - arpcom ac_enaddr ac_multicnt @@ -88,7 +54,7 @@ d_bbsize d_checksum d_cylskew - d_drivedata + d_drivedata d_flags d_headswitch d_interleave @@ -99,13 +65,13 @@ d_nsectors d_ntracks d_packname - d_partitions + d_partitions d_rpm d_sbsize d_secpercyl d_secperunit d_secsize - d_spare + d_spare d_sparespercyl d_sparespertrack d_subtype @@ -141,8 +107,8 @@ close_args fd - fd_l_ - fd_r_ + fd_l_ + fd_r_ confadd bus @@ -247,16 +213,16 @@ dirent d_fileno - d_name + d_name d_namlen d_reclen d_type dmadat - blkbuf - indbuf - sbbuf - secbuf + blkbuf + indbuf + sbbuf + secbuf dos_partition dp_ecyl @@ -373,23 +339,16 @@ bytes shorts - ethernetif - ethaddr - - ethip_hdr - PACK_STRUCT_FIELD - PACK_STRUCT_FIELD - fcntl_args arg - arg_l_ - arg_r_ + arg_l_ + arg_r_ cmd - cmd_l_ - cmd_r_ + cmd_l_ + cmd_r_ fd - fd_l_ - fd_r_ + fd_l_ + fd_r_ file f_flag @@ -457,7 +416,7 @@ fs_fsbtodb fs_fshift fs_fsize - fs_fsmnt + fs_fsmnt fs_iblkno fs_id fs_inopb @@ -472,7 +431,7 @@ fs_minfree fs_ncg fs_nindir - fs_ocsp + fs_ocsp fs_old_cgmask fs_old_cgoffset fs_old_cpc @@ -507,7 +466,7 @@ fs_sblockloc fs_sbsize fs_size - fs_snapinum + fs_snapinum fs_spare1 fs_spare2 fs_spare5 @@ -517,15 +476,15 @@ fs_swuid fs_time fs_unused_1 - fs_volname + fs_volname fstat_args fd - fd_l_ - fd_r_ + fd_l_ + fd_r_ sb - sb_l_ - sb_r_ + sb_l_ + sb_r_ gdt_descr __attribute__ @@ -557,17 +516,17 @@ gettimeofday_args tp - tp_l_ - tp_r_ + tp_l_ + tp_r_ tzp - tzp_l_ - tzp_r_ + tzp_l_ + tzp_r_ getuid_args dummy hostRingEntry - buff + buff data md @@ -601,38 +560,6 @@ swd twd - icmp_dur_hdr - PACK_STRUCT_FIELD - PACK_STRUCT_FIELD - PACK_STRUCT_FIELD - chksum - icode - type - unused - - icmp_echo_hdr - PACK_STRUCT_FIELD - PACK_STRUCT_FIELD - PACK_STRUCT_FIELD - PACK_STRUCT_FIELD - chksum - icode - id - seqno - type - - icmp_te_hdr - PACK_STRUCT_FIELD - PACK_STRUCT_FIELD - PACK_STRUCT_FIELD - chksum - icode - type - unused - - in_addr - s_addr - initBlock ladrf mode @@ -644,37 +571,14 @@ ioctl_args com - com_l_ - com_r_ + com_l_ + com_r_ data - data_l_ - data_r_ + data_l_ + data_r_ fd - fd_l_ - fd_r_ - - ip_addr - PACK_STRUCT_FIELD - addr - - ip_hdr - PACK_STRUCT_FIELD - PACK_STRUCT_FIELD - PACK_STRUCT_FIELD - PACK_STRUCT_FIELD - PACK_STRUCT_FIELD - PACK_STRUCT_FIELD - PACK_STRUCT_FIELD - PACK_STRUCT_FIELD - dest - flow1 - flow2 - hoplim - len - nexthdr - tclass1 - tclass2 - v + fd_l_ + fd_r_ issetugid_args dummy @@ -699,11 +603,6 @@ recvRing transRings - lwip_socket - conn - lastdata - lastoffset - mds md0 md1 @@ -725,26 +624,26 @@ mmap_args addr - addr_l_ - addr_r_ + addr_l_ + addr_r_ fd - fd_l_ - fd_r_ + fd_l_ + fd_r_ flags - flags_l_ - flags_r_ + flags_l_ + flags_r_ len - len_l_ - len_r_ + len_l_ + len_r_ pad - pad_l_ - pad_r_ + pad_l_ + pad_r_ pos - pos_l_ - pos_r_ + pos_l_ + pos_r_ prot - prot_l_ - prot_r_ + prot_l_ + prot_r_ mpi_mbox msg @@ -755,55 +654,23 @@ prev mpi_message - data + data header next pid munmap_args addr - addr_l_ - addr_r_ + addr_l_ + addr_r_ len - len_l_ - len_r_ + len_l_ + len_r_ net broadcast mac - netbuf - err - fromaddr - fromport - p - ptr - - netconn - acceptmbox - err - mbox - pcb - recvmbox - sem - state - tcp - type - udp - - netif - gw - hwaddr - input - ip_addr - linkoutput - name - netmask - next - num - output - state - nicBuffer buffer length @@ -818,8 +685,8 @@ obreak_args nsize - nsize_l_ - nsize_r_ + nsize_l_ + nsize_r_ ogDisplay_UbixOS ogAlias @@ -843,38 +710,6 @@ VESAInfo visualPage - ogDisplay_VESA - ogAlias - ogAvail - ogClear - ogClone - ogCopyLineFrom - ogCopyLineTo - ogCopyPal - ogCreate - ogDisplay_VESA - ogGetPixel - ogGetPtr - ogHLine - ogLoadPal - ogSetPixel - ogSetRGBPalette - ogVFlip - ogVLine - ~ogDisplay_VESA - findMode - getModeInfo - getVESAInfo - rawGetPixel - rawLine - rawSetPixel - setMode - setPal - InGraphics - ModeRec - ScreenSelector - VESARec - ogModeInfo __attribute__ __attribute__ @@ -926,14 +761,14 @@ open_args flags - flags_l_ - flags_r_ + flags_l_ + flags_r_ mode - mode_l_ - mode_r_ + mode_l_ + mode_r_ path - path_l_ - path_r_ + path_l_ + path_r_ osInfo controlKeys @@ -951,14 +786,6 @@ size startSector - pbuf - flags - len - next - payload - ref - tot_len - pciConfig base baseClass @@ -986,25 +813,25 @@ read_args buf - buf_l_ - buf_r_ + buf_l_ + buf_r_ fd - fd_l_ - fd_r_ + fd_l_ + fd_r_ nbyte - nbyte_l_ - nbyte_r_ + nbyte_l_ + nbyte_r_ readlink_args buf - buf_l_ - buf_r_ + buf_l_ + buf_r_ count - count_l_ - count_r_ + count_l_ + count_r_ path - path_l_ - path_r_ + path_l_ + path_r_ sdeWindows buf @@ -1015,48 +842,36 @@ setitimer_args itv - itv_l_ - itv_r_ + itv_l_ + itv_r_ oitv - oitv_l_ - oitv_r_ + oitv_l_ + oitv_r_ which - which_l_ - which_r_ + which_l_ + which_r_ sigaction_args act - act_l_ - act_r_ + act_l_ + act_r_ oact - oact_l_ - oact_r_ + oact_l_ + oact_r_ sig - sig_l_ - sig_r_ + sig_l_ + sig_r_ sigprocmask_args how - how_l_ - how_r_ + how_l_ + how_r_ oset - oset_l_ - oset_r_ + oset_l_ + oset_r_ set - set_l_ - set_r_ - - sockaddr - sa_data - sa_family - sa_len - - sockaddr_in - sin_addr - sin_family - sin_len - sin_port - sin_zero + set_l_ + set_r_ stat __st_atimensec @@ -1082,55 +897,25 @@ st_size st_uid - sys_mbox - first - last - mail - msgs - mutex - - sys_mbox_msg - msg - next - - sys_sem - c - cond - mutex - - sys_thread - next - timeouts - ubthread - - sys_timeout - arg - h - next - time - - sys_timeouts - next - sysctl_args name - name_l_ - name_r_ + name_l_ + name_r_ namelen - namelen_l_ - namelen_r_ + namelen_l_ + namelen_r_ new - new_l_ - new_r_ + new_l_ + new_r_ newlen - newlen_l_ - newlen_r_ + newlen_l_ + newlen_r_ old - old_l_ - old_r_ + old_l_ + old_r_ oldlenp - oldlenp_l_ - oldlenp_r_ + oldlenp_l_ + oldlenp_r_ sysctl_entry children @@ -1156,96 +941,12 @@ uid usedMath - tcp_hdr - PACK_STRUCT_FIELD - PACK_STRUCT_FIELD - PACK_STRUCT_FIELD - PACK_STRUCT_FIELD - PACK_STRUCT_FIELD - PACK_STRUCT_FIELD - PACK_STRUCT_FIELD - PACK_STRUCT_FIELD - - tcp_pcb - accept - acked - callback_arg - connected - cwnd - dupacks - errf - flags - lastack - local_ip - local_port - mss - next - nrtx - poll - pollinterval - polltmr - rcv_nxt - rcv_wnd - recv - recv_data - remote_ip - remote_port - rtime - rto - rtseq - rttest - sa - sent - snd_buf - snd_lbb - snd_max - snd_nxt - snd_queuelen - snd_wl1 - snd_wl2 - snd_wnd - ssthresh - state - sv - tmr - unacked - unsent - - tcp_pcb_listen - accept - callback_arg - local_ip - local_port - next - state - - tcp_seg - dataptr - len - next - p - tcphdr - - tcpip_msg - apimsg - inp - msg - netif - p - sem - type - thread - o_files + o_files td_retval vm_daddr vm_dsize - thread_start_param - arg - function - thread - timespec tv_nsec tv_sec @@ -1266,41 +967,6 @@ tz_dsttime tz_minuteswest - TMode_Rec - __attribute__ - __attribute__ - __attribute__ - __attribute__ - __attribute__ - __attribute__ - __attribute__ - __attribute__ - __attribute__ - __attribute__ - __attribute__ - __attribute__ - __attribute__ - __attribute__ - __attribute__ - __attribute__ - __attribute__ - __attribute__ - __attribute__ - __attribute__ - __attribute__ - __attribute__ - __attribute__ - __attribute__ - __attribute__ - __attribute__ - __attribute__ - __attribute__ - __attribute__ - __attribute__ - __attribute__ - __attribute__ - __attribute__ - tms tms_cstime tms_cutime @@ -1378,26 +1044,12 @@ tty_x tty_y - TVESA_Rec - __attribute__ - __attribute__ - __attribute__ - __attribute__ - __attribute__ - __attribute__ - __attribute__ - __attribute__ - __attribute__ - __attribute__ - __attribute__ - __attribute__ - ubixDiskLabel driveType magicNum magicNum2 numPartitions - partitions + partitions ubixDiskLabel::ubixPartitions pBatSize @@ -1437,40 +1089,24 @@ mutex next - udp_hdr - PACK_STRUCT_FIELD - PACK_STRUCT_FIELD - PACK_STRUCT_FIELD - PACK_STRUCT_FIELD - - udp_pcb - chksum_len - flags - local_port - next - recv - recv_arg - remote_ip - remote_port - ufs1_dinode di_atime di_atimensec di_blocks di_ctime di_ctimensec - di_db + di_db di_flags di_gen di_gid - di_ib + di_ib di_mode di_mtime di_mtimensec di_nlink di_size di_spare - di_u + di_u di_uid oldids @@ -1483,13 +1119,13 @@ di_blocks di_ctime di_ctimensec - di_db - di_extb + di_db + di_extb di_extsize di_flags di_gen di_gid - di_ib + di_ib di_kernflags di_mode di_mtime @@ -1531,16 +1167,14 @@ write_args buf - buf_l_ - buf_r_ + buf_l_ + buf_r_ fd - fd_l_ - fd_r_ + fd_l_ + fd_r_ nbyte - nbyte_l_ - nbyte_r_ - - null.c + nbyte_l_ + nbyte_r_ devfs.c devfs_init @@ -1557,7 +1191,7 @@ __END_DECLS _assert assert - __assert + __assert devfs.h devfs_init @@ -1713,7 +1347,7 @@ TX_2X_PAGES TX_PAGES dp_rcvhdr_t - ether_addr + ether_addr_t ne2k_init ne2kAllocBuffer ne2kDevInit @@ -1803,611 +1437,6 @@ mpi_postMessage mpi_spam - api.h - NETCONN_COPY - NETCONN_NOCOPY - netconn_state - NETCONN_NONE - NETCONN_WRITE - NETCONN_ACCEPT - NETCONN_RECV - NETCONN_CONNECT - NETCONN_CLOSE - netconn_type - NETCONN_TCP - NETCONN_UDP - NETCONN_UDPLITE - NETCONN_UDPNOCHKSUM - netbuf_alloc - netbuf_chain - netbuf_copy - netbuf_copy_partial - netbuf_data - netbuf_delete - netbuf_first - netbuf_free - netbuf_fromaddr - netbuf_fromport - netbuf_len - netbuf_new - netbuf_next - netbuf_ref - netconn_accept - netconn_addr - netconn_bind - netconn_close - netconn_connect - netconn_delete - netconn_err - netconn_listen - netconn_new - netconn_peer - netconn_recv - netconn_send - netconn_type - netconn_write - - api_msg.h - api_msg_type - API_MSG_NEWCONN - API_MSG_DELCONN - API_MSG_BIND - API_MSG_CONNECT - API_MSG_LISTEN - API_MSG_ACCEPT - API_MSG_SEND - API_MSG_RECV - API_MSG_WRITE - API_MSG_CLOSE - API_MSG_MAX - api_msg_input - api_msg_post - - arch.h - BIG_ENDIAN - LITTLE_ENDIAN - - cc.h - PACK_STRUCT_BEGIN - PACK_STRUCT_END - PACK_STRUCT_FIELD - PACK_STRUCT_STRUCT - - cpu.h - BYTE_ORDER - - init.h - TCPIP_INIT_DONE - - init.h - intFunctionPTR - init_tasks - init_tasksTotal - - lib.h - bcopy - bzero - strlen - strncmp - - perf.h - PERF_START - PERF_STOP - perf_init - perf_print - perf_print_times - - sys_arch.h - SYS_MBOX_NULL - SYS_SEM_NULL - sys_mbox_t - sys_sem_t - sys_thread_t - - debug.h - API_LIB_DEBUG - API_MSG_DEBUG - ARP_DEBUG - ASSERT - DEBUGF - DELIF_DEBUG - DEMO_DEBUG - DHCP_DEBUG - DROPIF_DEBUG - ICMP_DEBUG - INET_DEBUG - IP_DEBUG - IP_REASS_DEBUG - MEM_DEBUG - MEMP_DEBUG - NETIF_DEBUG - PBUF_DEBUG - SOCKETS_DEBUG - SYS_DEBUG - TAPIF_DEBUG - TCP_CWND_DEBUG - TCP_DEBUG - TCP_FR_DEBUG - TCP_INPUT_DEBUG - TCP_OUTPUT_DEBUG - TCP_QLEN_DEBUG - TCP_REXMIT_DEBUG - TCP_RST_DEBUG - TCP_RTO_DEBUG - TCP_WND_DEBUG - TCPDUMP_DEBUG - TCPIP_DEBUG - TUNIF_DEBUG - UDP_DEBUG - UNIXIF_DEBUG - - def.h - NULL - UMAX - - err.h - ERR_ABRT - ERR_ARG - ERR_BUF - ERR_CLSD - ERR_CONN - ERR_MEM - ERR_OK - ERR_RST - ERR_RTE - ERR_USE - ERR_VAL - lwip_strerr - err_t - - icmp.h - ICMP_DUR - ICMP_ECHO - ICMP_ER - ICMP_IR - ICMP_IRQ - ICMP_PP - ICMP_RD - ICMP_SQ - ICMP_TE - ICMP_TS - ICMP_TSR - ICMPH_CODE - ICMPH_CODE_SET - ICMPH_TYPE - ICMPH_TYPE_SET - icmp_dur_type - ICMP_DUR_NET - ICMP_DUR_HOST - ICMP_DUR_PROTO - ICMP_DUR_PORT - ICMP_DUR_FRAG - ICMP_DUR_SR - icmp_te_type - ICMP_TE_TTL - ICMP_TE_FRAG - icmp_dest_unreach - icmp_input - icmp_time_exceeded - PACK_STRUCT_STRUCT - PACK_STRUCT_STRUCT - PACK_STRUCT_STRUCT - - icmp.h - ICMP6_DUR - ICMP6_ECHO - ICMP6_ER - ICMP6_TE - icmp_dur_type - ICMP_DUR_NET - ICMP_DUR_HOST - ICMP_DUR_PROTO - ICMP_DUR_PORT - ICMP_DUR_FRAG - ICMP_DUR_SR - icmp_te_type - ICMP_TE_TTL - ICMP_TE_FRAG - icmp_dest_unreach - icmp_input - icmp_time_exceeded - - inet.h - htonl - HTONL - htons - HTONS - ntohl - NTOHL - ntohs - NTOHS - htonl - htons - inet_chksum - inet_chksum_pbuf - inet_chksum_pseudo - - inet.h - htonl - htons - inet_chksum - inet_chksum_pbuf - inet_chksum_pseudo - ntohl - ntohs - - ip.h - IP_DF - IP_HDRINCL - IP_HLEN - IP_MF - IP_OFFMASK - IP_PROTO_ICMP - IP_PROTO_TCP - IP_PROTO_UDP - IP_PROTO_UDPLITE - IP_RF - IPH_CHKSUM - IPH_CHKSUM_SET - IPH_HL - IPH_ID - IPH_ID_SET - IPH_LEN - IPH_LEN_SET - IPH_OFFSET - IPH_OFFSET_SET - IPH_PROTO - IPH_PROTO_SET - IPH_TOS - IPH_TTL - IPH_TTL_SET - IPH_V - IPH_VHLTOS_SET - ip_init - ip_input - ip_lookup - ip_output - ip_output_if - ip_route - PACK_STRUCT_STRUCT - - ip.h - IP_HDRINCL - IP_HLEN - IP_PROTO_ICMP - IP_PROTO_TCP - IP_PROTO_UDP - IP_PROTO_UDPLITE - ip_init - ip_input - ip_output - ip_output_if - ip_route - - ip_addr.h - IP4_ADDR - ip4_addr1 - ip4_addr2 - ip4_addr3 - ip4_addr4 - IP_ADDR_ANY - IP_ADDR_BROADCAST - ip_addr_cmp - ip_addr_debug_print - ip_addr_isany - ip_addr_isbroadcast - ip_addr_ismulticast - ip_addr_maskcmp - ip_addr_set - ip_addr_broadcast - PACK_STRUCT_STRUCT - - ip_addr.h - IP6_ADDR - IP_ADDR_ANY - ip_addr_cmp - ip_addr_isany - ip_addr_maskcmp - ip_addr_set - - list.h - list_delete - list_elems - list_first - list_map - list_new - list_pop - list_push - list_remove - - lwipopts.h - ARP_TABLE_SIZE - DHCP_DOES_ARP_CHECK - ICMP_STATS - ICMP_TTL - IP_FORWARD - IP_OPTIONS - IP_STATS - LINK_STATS - LWIP_DHCP - LWIP_TCP - LWIP_UDP - MEM_ALIGNMENT - MEM_RECLAIM - MEM_SIZE - MEM_STATS - MEMP_NUM_API_MSG - MEMP_NUM_NETBUF - MEMP_NUM_NETCONN - MEMP_NUM_PBUF - MEMP_NUM_SYS_TIMEOUT - MEMP_NUM_TCP_PCB - MEMP_NUM_TCP_PCB_LISTEN - MEMP_NUM_TCP_SEG - MEMP_NUM_TCPIP_MSG - MEMP_NUM_UDP_PCB - MEMP_RECLAIM - MEMP_STATS - PBUF_LINK_HLEN - PBUF_POOL_BUFSIZE - PBUF_POOL_SIZE - PBUF_STATS - STATS - SYS_STATS - TCP_MAXRTX - TCP_MSS - TCP_QUEUE_OOSEQ - TCP_SND_BUF - TCP_SND_QUEUELEN - TCP_STATS - TCP_SYNMAXRTX - TCP_TTL - TCP_WND - UDP_STATS - UDP_TTL - - mem.h - MEM_ALIGN - MEM_ALIGN_SIZE - mem_register_reclaim - mem_size_t - mem_free - mem_init - mem_malloc - mem_malloc2 - mem_realloc - mem_reallocm - - memp.h - memp_register_reclaim - memp_t - MEMP_PBUF - MEMP_UDP_PCB - MEMP_TCP_PCB - MEMP_TCP_PCB_LISTEN - MEMP_TCP_SEG - MEMP_NETBUF - MEMP_NETCONN - MEMP_API_MSG - MEMP_TCPIP_MSG - MEMP_SYS_TIMEOUT - MEMP_MAX - memp_free - memp_freep - memp_init - memp_malloc - memp_malloc2 - memp_mallocp - memp_realloc - - net.h - net_init - - netif.h - netif_add - netif_find - netif_init - netif_set_default - netif_set_gw - netif_set_ipaddr - netif_set_netmask - netif_default - netif_list - - opt.h - ICMP_TTL - LWIP_TCP - LWIP_UDP - MEM_ALIGNMENT - PBUF_LINK_HLEN - PBUF_POOL_BUFSIZE - PBUF_POOL_SIZE - TCP_MAXRTX - TCP_MSS - TCP_SYNMAXRTX - TCP_TTL - TCP_WND - UDP_TTL - - pbuf.h - PBUF_FLAG_POOL - PBUF_FLAG_RAM - PBUF_FLAG_ROM - PBUF_IP_HLEN - PBUF_TRANSPORT_HLEN - pbuf_flag - PBUF_RAM - PBUF_ROM - PBUF_POOL - pbuf_layer - PBUF_TRANSPORT - PBUF_IP - PBUF_LINK - PBUF_RAW - pbuf_alloc - pbuf_chain - pbuf_clen - pbuf_dechain - pbuf_free - pbuf_header - pbuf_init - pbuf_realloc - pbuf_ref - - sockets.h - AF_INET - INADDR_ANY - INADDR_BROADCAST - IPPROTO_TCP - IPPROTO_UDP - PF_INET - SOCK_DGRAM - SOCK_STREAM - lwip_accept - lwip_bind - lwip_close - lwip_connect - lwip_listen - lwip_read - lwip_recv - lwip_recvfrom - lwip_send - lwip_sendto - lwip_socket - lwip_write - - stats.h - stats_init - - sys.h - sys_timeout_handler - sys_arch_mbox_fetch - sys_arch_sem_wait - sys_arch_timeouts - sys_init - sys_mbox_fetch - sys_mbox_free - sys_mbox_new - sys_mbox_post - sys_now - sys_sem_free - sys_sem_new - sys_sem_signal - sys_sem_wait - sys_thread_new - sys_timeout - - tcp.h - tcp_ack - TCP_ACK - tcp_ack_now - TCP_FAST_INTERVAL - TCP_FIN - TCP_FIN_WAIT_TIMEOUT - TCP_HLEN - TCP_MSL - TCP_OOSEQ_TIMEOUT - tcp_pcbs_sane - TCP_PSH - TCP_REG - TCP_RMV - TCP_RST - TCP_SEQ_GEQ - TCP_SEQ_GT - TCP_SEQ_LEQ - TCP_SEQ_LT - TCP_SLOW_INTERVAL - tcp_sndbuf - TCP_SYN - TCP_SYN_RCVD_TIMEOUT - TCP_TCPLEN - TCP_TMR_INTERVAL - TCP_URG - TCPH_FLAGS - TCPH_FLAGS_SET - TCPH_OFFSET - TCPH_OFFSET_SET - TF_ACK_DELAY - TF_ACK_NOW - TF_CLOSED - TF_GOT_FIN - TF_INFR - TF_RESET - tcp_state - CLOSED - LISTEN - SYN_SENT - SYN_RCVD - ESTABLISHED - FIN_WAIT_1 - FIN_WAIT_2 - CLOSE_WAIT - CLOSING - LAST_ACK - TIME_WAIT - tcp_abort - tcp_accept - tcp_arg - tcp_bind - tcp_close - tcp_connect - tcp_enqueue - tcp_err - tcp_fasttmr - tcp_init - tcp_input - tcp_listen - tcp_new - tcp_next_iss - tcp_output - tcp_pcb_copy - tcp_pcb_purge - tcp_pcb_remove - tcp_poll - tcp_recv - tcp_recved - tcp_rexmit_seg - tcp_rst - tcp_seg_copy - tcp_seg_free - tcp_segs_free - tcp_send_ctrl - tcp_sent - tcp_slowtmr - tcp_tmr - tcp_write - PACK_STRUCT_STRUCT - tcp_active_pcbs - tcp_listen_pcbs - tcp_ticks - tcp_tmp_pcb - tcp_tw_pcbs - - tcpip.h - tcpip_msg_type - TCPIP_MSG_API - TCPIP_MSG_INPUT - tcpip_apimsg - tcpip_init - tcpip_input - - udp.h - udp_flags - UDP_FLAGS_NOCHKSUM - UDP_FLAGS_UDPLITE - UDP_HLEN - udp_setflags - udp_bind - udp_connect - udp_init - udp_input - udp_lookup - udp_new - udp_recv - udp_remove - udp_send - PACK_STRUCT_STRUCT - arp.h ARP_TMR_INTERVAL ETHTYPE_ARP @@ -2431,8 +1460,6 @@ tcpdump tcpdump_init - ogDisplay_VESA.h - hd.h hdCmd hdCylHi @@ -2881,6 +1908,11 @@ fork.h sysFork + init.h + intFunctionPTR + init_tasks + init_tasksTotal + kmod.h LD_START kmod_t @@ -2902,16 +1934,16 @@ Item_t List_t CreateItem - DestroyItemList - DestroyItemsInList - GetFirstItem - GetLastItem + DestroyItemList + DestroyItemsInList + GetFirstItem + GetLastItem InitializeList - InsertItemAtFront - InsertItemBetweenItems - InsertItemListBetweenItems - RemoveItem - RemoveItemListBetweenItems + InsertItemAtFront + InsertItemBetweenItems + InsertItemListBetweenItems + RemoveItem + RemoveItemListBetweenItems sched.h kTask_t @@ -3300,7 +2332,7 @@ B_UNITSHIFT kmain ubixDescriptorTable - loadGDT + loadGDT start.S lgdtl @@ -3330,8 +2362,8 @@ 8259.c i8259_init - irqDisable - irqEnable + irqDisable + irqEnable irqMask atkbd.c @@ -3461,10 +2493,10 @@ elfGetPhType elfGetRelType elfGetShType - elfPhType - elfRelType - elfShType - elfType + elfPhType + elfRelType + elfShType + elfType elfTypeName id id @@ -3819,8 +2851,6 @@ skip_atoi vsprintf - Makefile.inc - message.c sysMpiCreateMbox sysMpiDestroyMbox @@ -3838,191 +2868,6 @@ mboxList mpiSpinLock - api_lib.c - netbuf_alloc - netbuf_chain - netbuf_copy - netbuf_copy_partial - netbuf_data - netbuf_delete - netbuf_first - netbuf_free - netbuf_fromaddr - netbuf_fromport - netbuf_len - netbuf_new - netbuf_next - netbuf_ref - netconn_accept - netconn_addr - netconn_bind - netconn_close - netconn_connect - netconn_delete - netconn_err - netconn_listen - netconn_new - netconn_peer - netconn_recv - netconn_send - netconn_type - netconn_write - - api_msg.c - api_msg_decode - accept_function - api_msg_input - api_msg_post - do_accept - do_bind - do_close - do_connect - do_connected - do_delconn - do_listen - do_newconn - do_recv - do_send - do_write - err_tcp - poll_tcp - recv_tcp - recv_udp - sent_tcp - setup_tcp - decode - - err.c - - sockets.c - NUM_SOCKETS - alloc_socket - get_socket - lwip_accept - lwip_bind - lwip_close - lwip_connect - lwip_listen - lwip_read - lwip_recv - lwip_recvfrom - lwip_send - lwip_sendto - lwip_socket - lwip_write - sockets - - tcpip.c - tcpip_apimsg - tcpip_init - tcpip_input - tcpip_tcp_timer - tcpip_thread - mbox - tcpip_init_done - tcpip_init_done_arg - - bot.c - bot_init - bot_thread - - init.c - net_init - netMainThread - tcpip_init_done - - shell.c - ECLOSED - ESUCCESS - ESYNTAX - ETOOFEW - ETOOMANY - NCONNS - prompt - sendstr - shell_init - shell_main - shell_thread - buffer - - shell.h - shell_init - - sys_arch.c - SYS_MBOX_SIZE - UMAX - cond_wait - current_thread - sys_arch_mbox_fetch - sys_arch_sem_wait - sys_arch_timeouts - sys_init - sys_mbox_free - sys_mbox_new - sys_mbox_post - sys_sem_free - sys_sem_free_ - sys_sem_new - sys_sem_new_ - sys_sem_signal - sys_thread_new - sys_unix_now - netThreadSpinlock - starttime - threads - - udpecho.c - udpecho_init - udpecho_thread - - udpecho.h - udpecho_init - - arp.c - ARP_MAXAGE - ARP_REPLY - ARP_REQUEST - ARPH_HWLEN - ARPH_HWLEN_SET - ARPH_PROTOLEN - ARPH_PROTOLEN_SET - HWTYPE_ETHERNET - add_arp_entry - arp_arp_input - arp_init - arp_ip_input - arp_lookup - arp_query - arp_tmr - arp_table - ctime - PACK_STRUCT_STRUCT - - ethernetif.c - IFNAME0 - IFNAME1 - arp_timer - ethernetif_init - ethernetif_input - ethernetif_output - ethernetif_thread - ethernetif_thread - low_level_init - low_level_input - low_level_output - dev - ethbroadcast - tmpBuf - - loopif.c - loopif_init - loopif_output - - tcpdump.c - tcpdump - tcpdump_init - file - hd.c hdInit hdIoctl @@ -4057,7 +2902,7 @@ baseClass interface name - pciClasses + pciClasses subClass device.c @@ -4102,7 +2947,7 @@ setTaskVector setVector ubixDescriptorTable - loadidt + loadidt io.c inportByte @@ -4142,7 +2987,7 @@ thread.c ubixfs_thread mounts - ubixFS_Info + ubixFS_Info ubixfs.c openFileUbixFS @@ -4279,12 +3124,6 @@ vmmMemoryMap vmmSpinLock - src/sys/net/api/ - - src/sys/include/net/arch/ - - src/sys/compile/ - src/sys/include/devfs/ src/sys/devfs/ @@ -4293,10 +3132,6 @@ src/sys/init/ - src/sys/include/net/ipv4/ - - src/sys/include/net/ipv6/ - src/sys/isa/ src/sys/include/isa/ @@ -4313,18 +3148,8 @@ src/sys/include/mpi/ - src/sys/net/net/ - - src/sys/net/ - - src/sys/include/net/ - - src/sys/net/netif/ - src/sys/include/netif/ - src/sys/include/objgfx/ - src/sys/pci/ src/sys/include/pci/ diff --git a/doc/xml/io_8c.xml b/doc/xml/io_8c.xml index aaaa78f..566689d 100644 --- a/doc/xml/io_8c.xml +++ b/doc/xml/io_8c.xml @@ -4,13 +4,13 @@ io.c sys/io.h - + src/sys/sys/io.c - + - + sys/io.h @@ -179,9 +179,9 @@ hdInit hdRead hdWrite - i8259_init - irqDisable - irqEnable + i8259_init + irqDisable + irqEnable kbdWrite keyboardHandler kprint diff --git a/doc/xml/io_8h.xml b/doc/xml/io_8h.xml index 8eecce9..30ed189 100644 --- a/doc/xml/io_8h.xml +++ b/doc/xml/io_8h.xml @@ -21,223 +21,217 @@ src/sys/sys/video.c src/sys/vmm/vmm_memory.c - + src/sys/pci/lnc.c - + src/sys/pci/hd.c - + src/sys/pci/pci.c - - src/sys/net/net/sys_arch.c - - - + src/sys/kernel/vitals.c - + src/sys/kernel/tty.c - + src/sys/include/ubixos/vitals.h - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + src/sys/kernel/ubthread.c - + src/sys/kernel/systemtask.c - + src/sys/sys/dma.c - + src/sys/lib/ogprintf.cc - + src/sys/include/ubixos/time.h - + - + - + - + - + - + src/sys/kernel/fork.c - + src/sys/isa/pit.c - + src/sys/sys/video.c - + src/sys/init/main.c - + src/sys/include/ubixos/ubthread.h - + - - - + - + src/sys/kernel/syscall.c - + src/sys/isa/ne2k.c - + src/sys/sys/io.c - + src/sys/isa/atkbd.c - + src/sys/include/ubixos/init.h - - + + - + src/sys/vfs/mount.c - + src/sys/isa/8259.c - + src/sys/kernel/smp.c - + src/sys/kernel/time.c - + src/sys/vmm/vmm_memory.c - + src/sys/kernel/endtask.c - + src/sys/include/sys/io.h - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + src/sys/vfs/file.c - + src/sys/sys/idt.c - + src/sys/isa/fdc.c - + src/sys/isa/mouse.c - + src/sys/vfs/vfs.c @@ -411,9 +405,9 @@ hdInit hdRead hdWrite - i8259_init - irqDisable - irqEnable + i8259_init + irqDisable + irqEnable kbdWrite keyboardHandler kprint diff --git a/doc/xml/kern__descrip_8c.xml b/doc/xml/kern__descrip_8c.xml index 42630a5..35fc8e1 100644 --- a/doc/xml/kern__descrip_8c.xml +++ b/doc/xml/kern__descrip_8c.xml @@ -11,160 +11,144 @@ lib/kmalloc.h assert.h - + sys/thread.h - + - + ubixos/sched.h - + - + - + - + - + - + - + ubixos/endtask.h - + - + - + ubixos/types.h - + - + sys/_types.h - + vfs/file.h - + - + - + - + sys/tss.h - + - + lib/kmalloc.h - + - - vfs/vfs.h - - - - - - - - - - - - - + vfs/mount.h - - - + - + lib/kprintf.h - + - + sys/kern_descrip.h - + - + - + - + assert.h - + ubixfs/dirCache.h - + - + sys/sysproto.h - + - + - + ubixos/elf.h - + - + sys/signal.h - + - + src/sys/kernel/kern_descrip.c - + - + - + - + - + - + - + - + - + ubixos/tty.h - + @@ -192,7 +176,7 @@ close_args::fd kfree kprintf - thread::o_files + thread::o_files thread::td_retval @@ -221,7 +205,7 @@ kmalloc kprintf - thread::o_files + thread::o_files pipe sys_open @@ -253,7 +237,7 @@ FFLAGS kprintf O_ACCMODE - thread::o_files + thread::o_files thread::td_retval @@ -279,7 +263,7 @@ _current fstat_args::fd kprintf - thread::o_files + thread::o_files fstat_args::sb stat::st_blksize stat::st_mode @@ -336,7 +320,7 @@ kprintf - thread::o_files + thread::o_files read @@ -413,12 +397,12 @@ kprintf("[%s:%i]",__FILE__,__LINE__); #endif -if(td->o_files[uap->fd]==0x0){ +if(td->o_files[uap->fd]==0x0){ kprintf("ERROR!!!\n"); return(-1); } -fp=(structfile*)td->o_files[uap->fd]; +fp=(structfile*)td->o_files[uap->fd]; switch(uap->cmd){ case3: td->td_retval[0]=fp->f_flag; @@ -445,8 +429,8 @@ fp=(structfile*)kmalloc(sizeof(structfile)); /*First5DescriptorsAreReserved*/ for(i=5;i<1024;i++){ -if(td->o_files[i]==0x0){ -td->o_files[i]=(uInt32)fp; +if(td->o_files[i]==0x0){ +td->o_files[i]=(uInt32)fp; if(resultfd) *resultfd=i; if(resultfp) @@ -461,8 +445,8 @@ #ifdefDEBUG kprintf("[%s:%i]",__FILE__,__LINE__); #endif -kfree((void*)td->o_files[uap->fd]); -td->o_files[uap->fd]=0x0; +kfree((void*)td->o_files[uap->fd]); +td->o_files[uap->fd]=0x0; td->td_retval[0]=0x0; return(0x0); } @@ -483,7 +467,7 @@ kprintf("[%s:%i]",__FILE__,__LINE__); #endif -fp=(structfile*)_current->td.o_files[uap->fd]; +fp=(structfile*)_current->td.o_files[uap->fd]; uap->sb->st_mode=0x2180; uap->sb->st_blksize=0x1000; kprintf("fstat:%i",uap->fd); @@ -502,7 +486,7 @@ kprintf("[%s:%i]",__FILE__,__LINE__); #endif -*fp=(structfile*)td->o_files[fd]; +*fp=(structfile*)td->o_files[fd]; if(fp==0x0) error=-1; diff --git a/doc/xml/kern__descrip_8h.xml b/doc/xml/kern__descrip_8h.xml index 37f218a..c5313a4 100644 --- a/doc/xml/kern__descrip_8h.xml +++ b/doc/xml/kern__descrip_8h.xml @@ -11,117 +11,101 @@ src/sys/kernel/sched.c src/sys/vfs/vfs.c - + sys/thread.h - + - + ubixos/types.h - + - + sys/_types.h - + vfs/file.h - + - + - + - - vfs/vfs.h - - - - - - - - - - - - - + vfs/mount.h - - - + - + src/sys/include/sys/kern_descrip.h - + - + - + - + ubixfs/dirCache.h - + - + sys/sysproto.h - + - + - + sys/signal.h - + - + src/sys/kernel/pipe.c - + src/sys/kernel/sched.c - + src/sys/include/sys/kern_descrip.h - + - + - + - + - + - + src/sys/kernel/kern_descrip.c - + src/sys/kernel/gen_calls.c - + src/sys/vfs/vfs.c @@ -638,7 +622,7 @@ kmalloc kprintf - thread::o_files + thread::o_files pipe sys_open @@ -725,7 +709,7 @@ kprintf - thread::o_files + thread::o_files read diff --git a/doc/xml/kern__sig_8c.xml b/doc/xml/kern__sig_8c.xml index 2df3673..010d82c 100644 --- a/doc/xml/kern__sig_8c.xml +++ b/doc/xml/kern__sig_8c.xml @@ -11,158 +11,142 @@ lib/kmalloc.h assert.h - + sys/thread.h - + - + ubixos/sched.h - + - + - + - + - + - + - + ubixos/endtask.h - + - + - + src/sys/kernel/kern_sig.c - + - + - + - + - + - + - + - + - + ubixos/types.h - + - + sys/_types.h - + vfs/file.h - + - + - + - + sys/tss.h - + - + lib/kmalloc.h - + - - vfs/vfs.h - - - - - - - - - - - - - + vfs/mount.h - - - + - + lib/kprintf.h - + - + assert.h - + ubixfs/dirCache.h - + - + sys/kern_sig.h - + - + - + sys/sysproto.h - + - + - + ubixos/elf.h - + - + sys/signal.h - + - + ubixos/tty.h - + diff --git a/doc/xml/kern__sig_8h.xml b/doc/xml/kern__sig_8h.xml index dfd202a..41767ce 100644 --- a/doc/xml/kern__sig_8h.xml +++ b/doc/xml/kern__sig_8h.xml @@ -6,54 +6,54 @@ sys/sysproto.h src/sys/kernel/kern_sig.c - + sys/thread.h - + - + ubixos/types.h - + - + sys/_types.h - + src/sys/include/sys/kern_sig.h - + - + - + sys/sysproto.h - + - + - + sys/signal.h - + - + src/sys/kernel/kern_sig.c - + src/sys/include/sys/kern_sig.h - + diff --git a/doc/xml/kern__sysctl_8c.xml b/doc/xml/kern__sysctl_8c.xml index 7bb145a..03c8fc6 100644 --- a/doc/xml/kern__sysctl_8c.xml +++ b/doc/xml/kern__sysctl_8c.xml @@ -13,172 +13,156 @@ assert.h string.h - + sys/thread.h - + - + ubixos/kpanic.h - + ubixos/sched.h - + - + - + - + - + - + - + ubixos/endtask.h - + - + - + src/sys/kernel/kern_sysctl.c - + - + - + - + - + - + - + - + - + - + - + ubixos/types.h - + - + sys/_types.h - + string.h - + - + vfs/file.h - + - + - + - + sys/tss.h - + - + lib/kmalloc.h - + - + sys/kern_sysctl.h - + - + - - vfs/vfs.h - - - - - - - - - - - - - + vfs/mount.h - - - + - + lib/kprintf.h - + - + assert.h - + ubixfs/dirCache.h - + - + sys/sysproto.h - + - + - + ubixos/elf.h - + - + sys/signal.h - + - + ubixos/tty.h - + diff --git a/doc/xml/kern__sysctl_8h.xml b/doc/xml/kern__sysctl_8h.xml index f785e16..2e3e774 100644 --- a/doc/xml/kern__sysctl_8h.xml +++ b/doc/xml/kern__sysctl_8h.xml @@ -4,75 +4,75 @@ kern_sysctl.h sys/sysproto.h sys/thread.h - src/sys/include/ubixos/init.h + src/sys/include/ubixos/init.h src/sys/kernel/kern_sysctl.c src/sys/vmm/copyvirtualspace.c - + sys/thread.h - + - + ubixos/types.h - + - + sys/_types.h - + src/sys/include/sys/kern_sysctl.h - + - + - + sys/sysproto.h - + - + - + sys/signal.h - + - + src/sys/kernel/kern_sysctl.c - + src/sys/include/sys/kern_sysctl.h - + - + - + - + src/sys/init/main.c - + src/sys/include/ubixos/init.h - - + + - + src/sys/vmm/copyvirtualspace.c diff --git a/doc/xml/kmalloc_8c.xml b/doc/xml/kmalloc_8c.xml index 627e18b..e71ed2f 100644 --- a/doc/xml/kmalloc_8c.xml +++ b/doc/xml/kmalloc_8c.xml @@ -11,176 +11,160 @@ string.h assert.h - + sys/thread.h - + - + ubixos/kpanic.h - + ubixos/sched.h - + - + - + - + - + - + - + ubixos/spinlock.h - + - + src/sys/lib/kmalloc.c - + - + - + - + - + - + - + - + - + ubixos/types.h - + - + sys/_types.h - + vmm/paging.h - + - + - + - + string.h - + - + vfs/file.h - + - + - + - + sys/tss.h - + - + lib/kmalloc.h - + - + vmm/vmm.h - + - + - - vfs/vfs.h - - - - - - - - - - - - - + vfs/mount.h - - - + - + lib/kprintf.h - + - + assert.h - + ubixfs/dirCache.h - + - + sys/sysproto.h - + - + - + ubixos/elf.h - + - + sys/signal.h - + - + ubixos/tty.h - + @@ -274,8 +258,6 @@ ne2kFreeBuffer operator delete operator delete[] - sys_mbox_free - sys_sem_free_ sys_write sysExec systemTask @@ -332,7 +314,6 @@ kmod_load ldEnable lncAttach - low_level_init mpi_createMbox mpi_postMessage mpi_spam @@ -343,10 +324,6 @@ operator new[] sched_init schedNewTask - shell_thread - sys_mbox_new - sys_sem_new_ - sys_thread_new sys_write sysctl_add sysctl_init diff --git a/doc/xml/kmalloc_8h.xml b/doc/xml/kmalloc_8h.xml index dabfc98..3f9c6b9 100644 --- a/doc/xml/kmalloc_8h.xml +++ b/doc/xml/kmalloc_8h.xml @@ -25,12 +25,6 @@ src/sys/lib/kmalloc.c src/sys/lib/libcpp.cc src/sys/mpi/system.c - src/sys/net/api/tcpip.c - src/sys/net/net/bot.c - src/sys/net/net/init.c - src/sys/net/net/shell.c - src/sys/net/net/sys_arch.c - src/sys/net/netif/ethernetif.c src/sys/pci/hd.c src/sys/pci/lnc.c src/sys/sys/device.c @@ -46,277 +40,241 @@ src/sys/vmm/paging.c src/sys/vmm/vmm_memory.c - + ubixos/types.h - + - + sys/_types.h - + src/sys/include/lib/kmalloc.h - + - + src/sys/ufs/ffs.c - + src/sys/pci/lnc.c - + src/sys/pci/hd.c - - src/sys/net/net/sys_arch.c - - - + src/sys/kernel/vitals.c - + src/sys/kernel/tty.c - + src/sys/kmods/kmod.c - + src/sys/mpi/system.c - + src/sys/kernel/kern_sysctl.c - + src/sys/lib/kmalloc.c - + src/sys/vmm/paging.c - + src/sys/ubixfs/directory.c - + src/sys/ufs/ufs.c - + src/sys/kernel/kern_sig.c - + src/sys/kernel/ubthread.c - + src/sys/kernel/systemtask.c - - src/sys/net/netif/ethernetif.c - - - - src/sys/net/net/bot.c - - - + src/sys/kernel/ld.c - + src/sys/include/lib/kmalloc.h - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - + - - src/sys/net/api/tcpip.c - - - + src/sys/kernel/sched.c - - src/sys/net/net/shell.c - - - + src/sys/ubixfs/dirCache.c - + src/sys/ubixfs/ubixfs.c - - src/sys/net/net/init.c - - - + src/sys/init/main.c - + src/sys/kernel/bioscall.c - + src/sys/sys/device.c - + src/sys/kernel/syscall.c - + src/sys/isa/ne2k.c - + src/sys/isa/atkbd.c - + src/sys/vfs/mount.c - + src/sys/devfs/devfs.c - + src/sys/vmm/vmm_memory.c - + src/sys/kernel/kern_descrip.c - + src/sys/lib/libcpp.cc - + src/sys/vfs/file.c - + src/sys/sys/idt.c - + src/sys/kernel/gen_calls.c - + src/sys/kernel/exec.c - + src/sys/isa/fdc.c - + src/sys/vfs/vfs.c @@ -403,8 +361,6 @@ ne2kFreeBuffer operator delete operator delete[] - sys_mbox_free - sys_sem_free_ sys_write sysExec systemTask @@ -461,7 +417,6 @@ kmod_load ldEnable lncAttach - low_level_init mpi_createMbox mpi_postMessage mpi_spam @@ -472,10 +427,6 @@ operator new[] sched_init schedNewTask - shell_thread - sys_mbox_new - sys_sem_new_ - sys_thread_new sys_write sysctl_add sysctl_init diff --git a/doc/xml/kmod_8c.xml b/doc/xml/kmod_8c.xml index cad25ef..f3dc389 100644 --- a/doc/xml/kmod_8c.xml +++ b/doc/xml/kmod_8c.xml @@ -16,196 +16,194 @@ string.h assert.h - + sys/thread.h - + - + ubixos/kpanic.h - + ubixos/sched.h - + - + - + - + - + - + - + ubixos/spinlock.h - + - + src/sys/kmods/kmod.c - + - + - + - + - + - + - + - + - + - + - + - + - + - + ubixos/lists.h - + ubixos/types.h - + - + sys/_types.h - + vmm/paging.h - + - + - + - + string.h - + - + vfs/file.h - + - + - + - + sys/tss.h - + - + lib/kmalloc.h - + - + vmm/vmm.h - + - + - + vfs/vfs.h - + - + - + - + - + - + vfs/mount.h - - - + - + lib/kprintf.h - + - + ubixos/kmod.h - + - + assert.h - + ubixfs/dirCache.h - + - + sys/sysproto.h - + - + - + ubixos/elf.h - + - + sys/signal.h - + - + ubixos/tty.h - + @@ -233,12 +231,12 @@ CreateItem _item_t::data InitializeList - InsertItemAtFront + InsertItemAtFront kmalloc kmod_load kprintf List - NULL + NULL uInt32 @@ -380,10 +378,10 @@ } tmp=CreateItem(); -InsertItemAtFront(List,tmp); +InsertItemAtFront(List,tmp); kmods=kmalloc(sizeof*kmods); tmp->data=kmods; -if(kmods==NULL) +if(kmods==NULL) { kprintf("kmod_add:unabletoallocatememory!\n"); return0x0; diff --git a/doc/xml/kmod_8h.xml b/doc/xml/kmod_8h.xml index ca2adc6..2b9dd45 100644 --- a/doc/xml/kmod_8h.xml +++ b/doc/xml/kmod_8h.xml @@ -5,32 +5,32 @@ ubixos/types.h src/sys/kmods/kmod.c - + ubixos/types.h - + - + sys/_types.h - + src/sys/include/ubixos/kmod.h - + - + src/sys/kmods/kmod.c - + src/sys/include/ubixos/kmod.h - + @@ -88,12 +88,12 @@ CreateItem _item_t::data InitializeList - InsertItemAtFront + InsertItemAtFront kmalloc kmod_load kprintf List - NULL + NULL uInt32 diff --git a/doc/xml/kpanic_8c.xml b/doc/xml/kpanic_8c.xml index ef7a81d..31c015f 100644 --- a/doc/xml/kpanic_8c.xml +++ b/doc/xml/kpanic_8c.xml @@ -9,62 +9,62 @@ stdarg.h ubixos/tty.h - + ubixos/kpanic.h - + stdarg.h - + ubixos/types.h - + - + sys/_types.h - + sys/video.h - + - + lib/kprintf.h - + - + src/sys/kernel/kpanic.c - + - + - + - + - + - + - + ubixos/tty.h - + - + isa/8259.h - + @@ -96,9 +96,9 @@ - irqDisable + irqDisable kprintf - NULL + NULL tty_foreground vaEnd vaStart @@ -130,10 +130,8 @@ readUbixFS sched_init schedNewTask - sys_thread_new sysExec systemTask - tcpdump_init tty_change tty_init ubixfs_init @@ -199,7 +197,7 @@ vaEnd(args); /*It'simportantthatweprintonthecurrentterminalsolet'sresetforeground*/ -tty_foreground=NULL; +tty_foreground=NULL; kprintf("kPanic:%s",buf); /*HaltTheSystem*/ diff --git a/doc/xml/kpanic_8h.xml b/doc/xml/kpanic_8h.xml index 8ca8d47..acb282e 100644 --- a/doc/xml/kpanic_8h.xml +++ b/doc/xml/kpanic_8h.xml @@ -19,8 +19,6 @@ src/sys/lib/assert.c src/sys/lib/kmalloc.c src/sys/lib/kprintf.c - src/sys/net/net/sys_arch.c - src/sys/net/netif/tcpdump.c src/sys/sys/idt.c src/sys/ubixfs/thread.c src/sys/ubixfs/ubixfs.c @@ -37,211 +35,199 @@ src/sys/vmm/vmm_init.c src/sys/vmm/vmm_memory.c - + src/sys/ufs/ffs.c - + src/sys/include/ubixos/kpanic.h - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + - + src/sys/lib/kprintf.c - - src/sys/net/netif/tcpdump.c - - - - src/sys/net/net/sys_arch.c - - - + src/sys/kernel/vitals.c - + src/sys/kernel/tty.c - + src/sys/kmods/kmod.c - + src/sys/kernel/kern_sysctl.c - + src/sys/lib/kmalloc.c - + src/sys/vmm/paging.c - + src/sys/ufs/ufs.c - + src/sys/kernel/systemtask.c - + src/sys/kernel/ld.c - + src/sys/vmm/vmm_init.c - + src/sys/kernel/sched.c - + src/sys/vmm/setpageattributes.c - + src/sys/ubixfs/ubixfs.c - + src/sys/lib/assert.c - + src/sys/init/main.c - + src/sys/isa/ne2k.c - + src/sys/isa/atkbd.c - + src/sys/vmm/pagefault.c - + src/sys/ubixfs/thread.c - + src/sys/vfs/mount.c - + src/sys/devfs/devfs.c - + src/sys/kernel/kpanic.c - + src/sys/kernel/smp.c - + src/sys/vmm/vmm_memory.c - + src/sys/vfs/file.c - + src/sys/vmm/getfreepage.c - + src/sys/sys/idt.c - + src/sys/kernel/exec.c - + src/sys/vmm/getfreevirtualpage.c - + src/sys/vmm/copyvirtualspace.c @@ -302,9 +288,9 @@ - irqDisable + irqDisable kprintf - NULL + NULL tty_foreground vaEnd vaStart @@ -336,10 +322,8 @@ readUbixFS sched_init schedNewTask - sys_thread_new sysExec systemTask - tcpdump_init tty_change tty_init ubixfs_init diff --git a/doc/xml/kprint_8h.xml b/doc/xml/kprint_8h.xml index 9f7b3af..338b4c4 100644 --- a/doc/xml/kprint_8h.xml +++ b/doc/xml/kprint_8h.xml @@ -5,31 +5,31 @@ ubixos/types.h src/sys/vmm/getfreevirtualpage.c - + ubixos/types.h - + - + sys/_types.h - + src/sys/include/lib/kprint.h - + - + src/sys/include/lib/kprint.h - + - + src/sys/vmm/getfreevirtualpage.c @@ -59,9 +59,7 @@ _int13 addDirEntry apicMagic - arp_arp_input atkbd_init - bot_thread close devfs_makeNode devfs_open @@ -86,7 +84,7 @@ hdInit hdRead hdWrite - i8259_init + i8259_init idt_init inet_aton initHardDisk @@ -106,15 +104,12 @@ lncAttach lncInt lookup - low_level_init mmap mouseHandler mouseInit munmap ne2k_init ne2kHandler - netconn_connect - netMainThread obreak openFileUbixFS pci_init @@ -124,9 +119,6 @@ readlink sched_init seek - shell_main - shell_thread - sys_thread_new sys_write sysAuth syscall @@ -143,7 +135,6 @@ ubixfs_thread ubixFSUnlink ubthread_mutex_lock - udpecho_thread ufs_writeFile vfs_init vfs_mount diff --git a/doc/xml/kprintf_8c.xml b/doc/xml/kprintf_8c.xml index 86e69a6..ba4ba38 100644 --- a/doc/xml/kprintf_8c.xml +++ b/doc/xml/kprintf_8c.xml @@ -7,46 +7,46 @@ ubixos/kpanic.h stdarg.h - + ubixos/kpanic.h - + src/sys/lib/kprintf.c - + - + - + - + - + stdarg.h - + ubixos/types.h - + - + sys/_types.h - + sys/video.h - + - + lib/kprintf.h - + diff --git a/doc/xml/kprintf_8h.xml b/doc/xml/kprintf_8h.xml index 31914e0..90d0a67 100644 --- a/doc/xml/kprintf_8h.xml +++ b/doc/xml/kprintf_8h.xml @@ -35,14 +35,6 @@ src/sys/lib/kmalloc.c src/sys/lib/kprintf.c src/sys/lib/net.c - src/sys/net/api/api_lib.c - src/sys/net/net/bot.c - src/sys/net/net/init.c - src/sys/net/net/shell.c - src/sys/net/net/sys_arch.c - src/sys/net/net/udpecho.c - src/sys/net/netif/arp.c - src/sys/net/netif/ethernetif.c src/sys/pci/hd.c src/sys/pci/lnc.c src/sys/pci/pci.c @@ -61,367 +53,319 @@ src/sys/vmm/paging.c src/sys/vmm/vmm_memory.c - + ubixos/types.h - + - + sys/_types.h - + src/sys/include/lib/kprintf.h - + - + src/sys/ufs/ffs.c - - src/sys/net/net/udpecho.c - - - + src/sys/pci/lnc.c - + src/sys/lib/kprintf.c - + src/sys/pci/hd.c - + src/sys/lib/net.c - + src/sys/pci/pci.c - - src/sys/net/net/sys_arch.c - - - + src/sys/kernel/vitals.c - + src/sys/kernel/tty.c - + src/sys/kmods/kmod.c - + src/sys/kernel/kern_sysctl.c - + src/sys/kernel/pipe.c - + src/sys/lib/kmalloc.c - + src/sys/vmm/paging.c - + src/sys/ubixfs/directory.c - + src/sys/ufs/ufs.c - + src/sys/kernel/kern_sig.c - + src/sys/kernel/ubthread.c - + src/sys/kernel/systemtask.c - - src/sys/net/netif/ethernetif.c - - - - src/sys/net/netif/arp.c - - - - src/sys/net/net/bot.c - - - + src/sys/kernel/ld.c - + src/sys/init/static.c - + src/sys/kernel/sched.c - + src/sys/isa/pit.c - - src/sys/net/net/shell.c - - - - src/sys/net/api/api_lib.c - - - + src/sys/ubixfs/dirCache.c - + src/sys/ubixfs/ubixfs.c - - src/sys/net/net/init.c - - - + src/sys/include/lib/kprintf.h - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - + - + src/sys/lib/assert.c - + src/sys/init/main.c - + src/sys/sys/device.c - + src/sys/kernel/syscall.c - + src/sys/isa/ne2k.c - + src/sys/isa/atkbd.c - + src/sys/vmm/pagefault.c - + src/sys/ubixfs/thread.c - + src/sys/vfs/mount.c - + src/sys/devfs/devfs.c - + src/sys/kernel/kpanic.c - + src/sys/isa/8259.c - + src/sys/kernel/smp.c - + src/sys/kernel/time.c - + src/sys/vmm/vmm_memory.c - + src/sys/kernel/kern_descrip.c - + src/sys/kernel/endtask.c - + src/sys/vfs/file.c - + src/sys/sys/idt.c - + src/sys/kernel/gen_calls.c - + src/sys/kernel/syscall_new.c - + src/sys/kernel/exec.c - + src/sys/isa/fdc.c - + src/sys/isa/mouse.c - + src/sys/vfs/vfs.c diff --git a/doc/xml/ld_8c.xml b/doc/xml/ld_8c.xml index 4bc7d3c..c777aed 100644 --- a/doc/xml/ld_8c.xml +++ b/doc/xml/ld_8c.xml @@ -14,182 +14,180 @@ string.h assert.h - + sys/thread.h - + - + ubixos/kpanic.h - + ubixos/sched.h - + - + - + - + - + - + - + ubixos/types.h - + - + sys/_types.h - + vmm/paging.h - + - + - + - + string.h - + - + vfs/file.h - + - + - + - + src/sys/kernel/ld.c - + - + - + - + - + - + - + - + - + - + - + - + sys/tss.h - + - + lib/kmalloc.h - + - + vmm/vmm.h - + - + - + vfs/vfs.h - + - + - + - + - + - + vfs/mount.h - - - + - + lib/kprintf.h - + - + ubixos/ld.h - + - + assert.h - + ubixfs/dirCache.h - + - + sys/sysproto.h - + - + - + ubixos/elf.h - + - + sys/signal.h - + - + ubixos/tty.h - + diff --git a/doc/xml/ld_8h.xml b/doc/xml/ld_8h.xml index 9b52354..5e62e94 100644 --- a/doc/xml/ld_8h.xml +++ b/doc/xml/ld_8h.xml @@ -6,37 +6,37 @@ src/sys/kernel/exec.c src/sys/kernel/ld.c - + ubixos/types.h - + - + sys/_types.h - + src/sys/include/ubixos/ld.h - + - + src/sys/kernel/ld.c - + src/sys/include/ubixos/ld.h - + - + - + src/sys/kernel/exec.c diff --git a/doc/xml/lib_2string_8h.xml b/doc/xml/lib_2string_8h.xml index eb092e1..9b4d254 100644 --- a/doc/xml/lib_2string_8h.xml +++ b/doc/xml/lib_2string_8h.xml @@ -22,133 +22,133 @@ src/sys/vfs/mount.c src/sys/vfs/vfs.c - + ubixos/types.h - + - + sys/_types.h - + src/sys/include/lib/string.h - + - + src/sys/ufs/ffs.c - + src/sys/lib/string.c - + src/sys/lib/strtok.c - + src/sys/mpi/system.c - + src/sys/ubixfs/directory.c - + src/sys/ufs/ufs.c - + src/sys/include/lib/string.h - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + src/sys/ubixfs/dirCache.c - + src/sys/ubixfs/ubixfs.c - + src/sys/kernel/bioscall.c - + src/sys/kernel/syscall.c - + src/sys/vfs/mount.c - + src/sys/devfs/devfs.c - + src/sys/kernel/smp.c - + src/sys/lib/vsprintf.c - + src/sys/vfs/file.c - + src/sys/kernel/syscall_new.c - + src/sys/kernel/exec.c - + src/sys/vfs/vfs.c @@ -319,7 +319,6 @@ ldEnable mpi_destroyMbox mpi_findMbox - shell_main systemTask ubixfs_cacheFind ubixfs_findName @@ -435,7 +434,7 @@ - NULL + NULL strlen strncmp fopen @@ -491,7 +490,7 @@ - NULL + NULL strtok diff --git a/doc/xml/libcpp_8cc.xml b/doc/xml/libcpp_8cc.xml index 9e7df48..59deb81 100644 --- a/doc/xml/libcpp_8cc.xml +++ b/doc/xml/libcpp_8cc.xml @@ -6,42 +6,42 @@ sys/video.h lib/libcpp.h - + lib/libcpp.h - + - + ubixos/types.h - + - + sys/_types.h - + sys/video.h - + - + lib/kmalloc.h - + - + src/sys/lib/libcpp.cc - + - + - + diff --git a/doc/xml/libcpp_8h.xml b/doc/xml/libcpp_8h.xml index f545bd0..f161518 100644 --- a/doc/xml/libcpp_8h.xml +++ b/doc/xml/libcpp_8h.xml @@ -5,31 +5,31 @@ ubixos/types.h src/sys/lib/libcpp.cc - + src/sys/include/lib/libcpp.h - + - + ubixos/types.h - + - + sys/_types.h - + src/sys/include/lib/libcpp.h - + - + src/sys/lib/libcpp.cc diff --git a/doc/xml/lists_8h.xml b/doc/xml/lists_8h.xml index 2898fbb..bede1a6 100644 --- a/doc/xml/lists_8h.xml +++ b/doc/xml/lists_8h.xml @@ -4,14 +4,14 @@ lists.h src/sys/kmods/kmod.c - + src/sys/kmods/kmod.c - + src/sys/include/ubixos/lists.h - + @@ -94,13 +94,13 @@ kmod_add - + int int DestroyItemList - (IN List_t *ItemList) + (List_t *ItemList) DestroyItemList - IN List_t * + List_t * ItemList @@ -111,13 +111,13 @@ - + int int DestroyItemsInList - (IN List_t *ItemList) + (List_t *ItemList) DestroyItemsInList - IN List_t * + List_t * ItemList @@ -128,13 +128,13 @@ - + Item_t * Item_t* GetFirstItem - (IN List_t *kItem) + (List_t *kItem) GetFirstItem - IN List_t * + List_t * kItem @@ -145,13 +145,13 @@ - + Item_t * Item_t* GetLastItem - (IN List_t *kItem) + (List_t *kItem) GetLastItem - IN List_t * + List_t * kItem @@ -176,17 +176,17 @@ kmod_add - + int int InsertItemAtFront - (IN List_t *TList, IN Item_t *kItem) + (List_t *TList, Item_t *kItem) InsertItemAtFront - IN List_t * + List_t * TList - IN Item_t * + Item_t * kItem @@ -198,25 +198,25 @@ kmod_add - + int int InsertItemBetweenItems - (IN List_t *TList, IN Item_t *Previous, IN Item_t *Next, IN Item_t *Insert) + (List_t *TList, Item_t *Previous, Item_t *Next, Item_t *Insert) InsertItemBetweenItems - IN List_t * + List_t * TList - IN Item_t * + Item_t * Previous - IN Item_t * + Item_t * Next - IN Item_t * + Item_t * Insert @@ -227,21 +227,21 @@ - + void void InsertItemListBetweenItems - (IN Item_t *Previous, IN Item_t *Next, IN List_t *Insert) + (Item_t *Previous, Item_t *Next, List_t *Insert) InsertItemListBetweenItems - IN Item_t * + Item_t * Previous - IN Item_t * + Item_t * Next - IN List_t * + List_t * Insert @@ -252,17 +252,17 @@ - + int int RemoveItem - (IN List_t *TList, IN Item_t *kItem) + (List_t *TList, Item_t *kItem) RemoveItem - IN List_t * + List_t * TList - IN Item_t * + Item_t * kItem @@ -273,17 +273,17 @@ - + List_t * List_t* RemoveItemListBetweenItems - (IN Item_t *Previous, IN Item_t *Next) + (Item_t *Previous, Item_t *Next) RemoveItemListBetweenItems - IN Item_t * + Item_t * Previous - IN Item_t * + Item_t * Next @@ -324,31 +324,31 @@ Item_t* CreateItem(); int -InsertItemAtFront(INList_t*TList, +InsertItemAtFront(INList_t*TList, INItem_t*kItem); int -InsertItemBetweenItems(INList_t*TList, +InsertItemBetweenItems(INList_t*TList, INItem_t*Previous, INItem_t*Next, INItem_t*Insert); int -RemoveItem(INList_t*TList, +RemoveItem(INList_t*TList, INItem_t*kItem); int -DestroyItemsInList(INList_t*ItemList); +DestroyItemsInList(INList_t*ItemList); int -DestroyItemList(INList_t*ItemList); +DestroyItemList(INList_t*ItemList); Item_t* -GetFirstItem(INList_t*kItem); +GetFirstItem(INList_t*kItem); Item_t* -GetLastItem(INList_t*kItem); +GetLastItem(INList_t*kItem); List_t* -RemoveItemListBetweenItems(INItem_t*Previous, +RemoveItemListBetweenItems(INItem_t*Previous, INItem_t*Next); void -InsertItemListBetweenItems(INItem_t*Previous, +InsertItemListBetweenItems(INItem_t*Previous, INItem_t*Next, INList_t*Insert); diff --git a/doc/xml/lnc_8c.xml b/doc/xml/lnc_8c.xml index f8218c3..18b048a 100644 --- a/doc/xml/lnc_8c.xml +++ b/doc/xml/lnc_8c.xml @@ -12,82 +12,82 @@ sys/video.h isa/8259.h - + src/sys/pci/lnc.c - + - + - + - + - + - + - + - + - + - + pci/lnc.h - + - + ubixos/types.h - + - + sys/_types.h - + sys/video.h - + - + lib/kmalloc.h - + - + sys/idt.h - + - + - + lib/kprintf.h - + - + sys/gdt.h - + sys/io.h - + isa/8259.h - + diff --git a/doc/xml/lnc_8h.xml b/doc/xml/lnc_8h.xml index 9aa7465..8bdc083 100644 --- a/doc/xml/lnc_8h.xml +++ b/doc/xml/lnc_8h.xml @@ -5,32 +5,32 @@ ubixos/types.h src/sys/pci/lnc.c - + src/sys/include/pci/lnc.h - + - + ubixos/types.h - + - + sys/_types.h - + src/sys/pci/lnc.c - + src/sys/include/pci/lnc.h - + @@ -1300,7 +1300,7 @@ union{ //structmbuf*mbuf; char*data; -}buff; +}buff; }; structarpcom{ diff --git a/doc/xml/loopif_8h.xml b/doc/xml/loopif_8h.xml index cd18428..107c531 100644 --- a/doc/xml/loopif_8h.xml +++ b/doc/xml/loopif_8h.xml @@ -2,125 +2,18 @@ loopif.h - net/netif.h - src/sys/net/net/init.c - src/sys/net/netif/loopif.c + net/netif.h - + net/netif.h - - - - - - - - - - - - - arch/cpu.h - - - - ubixos/types.h - - - - - - sys/_types.h - - - - net/arch.h - - - - - - - - net/lwipopts.h - - - - net/ipv4/ip_addr.h - - - - - - net/err.h - - - - - - - - - + src/sys/include/netif/loopif.h - + - - net/opt.h - - - - - - net/pbuf.h - - - - - - - - net/debug.h - - - - net/ipv4/inet.h - - - - - - - - - - - - net/arch/cc.h - - - - - src/sys/net/netif/loopif.c - - - - src/sys/net/net/init.c - - - - src/sys/include/netif/loopif.h - - - - - - - void @@ -128,7 +21,7 @@ (struct netif *netif) loopif_init - struct netif * + struct netif * netif @@ -137,11 +30,7 @@ - - loopif_output - netif::name - netif::output - netMainThread + @@ -186,9 +75,9 @@ #ifndef__NETIF_LOOPIF_H__ #define__NETIF_LOOPIF_H__ -#include"net/netif.h" +#include"net/netif.h" -voidloopif_init(structnetif*netif); +voidloopif_init(structnetif*netif); #endif/*__NETIF_LOOPIF_H__*/ diff --git a/doc/xml/main_8c.xml b/doc/xml/main_8c.xml index 53c01e6..39da494 100644 --- a/doc/xml/main_8c.xml +++ b/doc/xml/main_8c.xml @@ -2,7 +2,7 @@ main.c - ubixos/init.h + ubixos/init.h sys/gdt.h sys/video.h sys/tss.h @@ -13,384 +13,379 @@ lib/kprintf.h lib/kmalloc.h - + ufs/ufs.h - + - + - + - + sys/thread.h - + - + ubixos/kpanic.h - + pci/pci.h - + - + ubixos/sched.h - + - + - + - + - + - + - + sys/device.old.h - + - + isa/ne2k.h - + - + - + devfs/devfs.h - + - + - + ubixos/vitals.h - + - + - + - + - + ubixos/systemtask.h - + - + ubixos/types.h - + - - net/net.h - - - - - + sys/_types.h - + sys/video.h - + - + vmm/paging.h - + - + - + - + ubixos/time.h - + - + - + vfs/file.h - + - + - + - + sys/tss.h - + - + lib/kmalloc.h - + - + sys/kern_sysctl.h - + - + - + vmm/vmm.h - + - + - + mpi/mpi.h - + - + - + sys/idt.h - + - + - + vfs/vfs.h - + - + - + - + - + - + vfs/mount.h - - - + - + lib/kprintf.h - + - + src/sys/init/main.c - + - + - + - + - + - + - + - + - + - + - + ubixfs/ubixfs.h - + - + - + - + - + - + isa/atkbd.h - + sys/gdt.h - + + net/net.h + + isa/pit.h - + ubixos/ubthread.h - + - + - + - + ubixfs/dirCache.h - + - + ubixos/exec.h - + - + - + pci/hd.h - + - + ubixos/init.h - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + isa/fdc.h - + - + sys/sysproto.h - + - + - + ubixos/elf.h - + - + sys/signal.h - + - + ubixos/tty.h - + - + sys/io.h - + isa/8259.h - + - + ubixos/static.h - + sys/device.h - + @@ -641,14 +636,14 @@ execFile execThread vitalsStruct::freePages - init_tasks - init_tasksTotal - irqEnable + init_tasks + init_tasksTotal + irqEnable kmalloc kpanic kprint kprintf - NULL + NULL systemTask systemVitals vfs_mount @@ -687,9 +682,9 @@ - - @8 - struct @8 loadGDT + + @2 + struct @2 loadGDT loadGDT @@ -735,7 +730,7 @@ *****************************************************************************************/ -#include<ubixos/init.h> +#include<ubixos/init.h> #include<sys/gdt.h> #include<sys/video.h> #include<sys/tss.h> @@ -795,7 +790,7 @@ struct{ unsignedshortlimit__attribute__((packed)); uniondescriptorTableUnion*gdt__attribute__((packed)); -}loadGDT={(9*sizeof(uniondescriptorTableUnion)-1),ubixGDT}; +}loadGDT={(9*sizeof(uniondescriptorTableUnion)-1),ubixGDT}; intkmain(uInt32rootdev){ /*Setupcounterforstartuproutine*/ @@ -808,8 +803,8 @@ kprint("BBB"); kprintf("TEST"); /*Modifysrc/sys/include/ubixos/init.htoaddastartuproutine*/ -for(i=0x0;i<init_tasksTotal;i++){ -if(init_tasks[i]()!=0x0){ +for(i=0x0;i<init_tasksTotal;i++){ +if(init_tasks[i]()!=0x0){ kpanic("Error:InitializingSystem.\n"); } } @@ -838,7 +833,7 @@ kprintf("StartingOS\n"); sysTask=kmalloc(0x2000); -if(sysTask==NULL) +if(sysTask==NULL) kprintf("OS:Unabletoallocatememory\n"); execThread(systemTask,(uInt32)sysTask+0x2000,0x0); diff --git a/doc/xml/math_8h.xml b/doc/xml/math_8h.xml index 2d8139a..55c4a32 100644 --- a/doc/xml/math_8h.xml +++ b/doc/xml/math_8h.xml @@ -6,38 +6,38 @@ src/sys/lib/atan.c src/sys/lib/divdi3.c - + ubixos/types.h - + - + sys/_types.h - + src/sys/include/math.h - + - + src/sys/lib/divdi3.c - + src/sys/lib/atan.c - + src/sys/include/math.h - + - + diff --git a/doc/xml/memcpy_8c.xml b/doc/xml/memcpy_8c.xml index 3f6cc89..ec46abb 100644 --- a/doc/xml/memcpy_8c.xml +++ b/doc/xml/memcpy_8c.xml @@ -4,39 +4,39 @@ memcpy.c bcopy.c - + src/sys/lib/memcpy.c - + - + ubixos/types.h - + - + sys/_types.h - + string.h - + - + strings.h - + bcopy.c - + - + - + diff --git a/doc/xml/memset_8c.xml b/doc/xml/memset_8c.xml index 1aa3ac6..e27d892 100644 --- a/doc/xml/memset_8c.xml +++ b/doc/xml/memset_8c.xml @@ -4,26 +4,26 @@ memset.c string.h - + ubixos/types.h - + - + sys/_types.h - + string.h - + - + src/sys/lib/memset.c - + diff --git a/doc/xml/message_8c.xml b/doc/xml/message_8c.xml index c7465cd..d226fd5 100644 --- a/doc/xml/message_8c.xml +++ b/doc/xml/message_8c.xml @@ -4,120 +4,90 @@ message.c mpi/mpi.h - + sys/thread.h - + - + ubixos/sched.h - + - + - + - + - + - + - + src/sys/mpi/message.c - + - + ubixos/types.h - + - + sys/_types.h - + vfs/file.h - + - + - + - + sys/tss.h - + - + mpi/mpi.h - + - + - - vfs/vfs.h - - - - - - - - - - - - - + vfs/mount.h - - - + - + ubixfs/dirCache.h - + - - sys/sysproto.h - - - - - - - + ubixos/elf.h - + - - sys/signal.h - - - - - + ubixos/tty.h - + diff --git a/doc/xml/mount_8c.xml b/doc/xml/mount_8c.xml index ce2b80c..db9f762 100644 --- a/doc/xml/mount_8c.xml +++ b/doc/xml/mount_8c.xml @@ -10,186 +10,184 @@ lib/string.h sys/device.h - + sys/thread.h - + - + ubixos/kpanic.h - + ubixos/sched.h - + - + - + - + - + - + - + ubixos/vitals.h - + - + - + - + - + ubixos/types.h - + - + sys/_types.h - + lib/string.h - + - + ubixos/time.h - + - + - + vfs/file.h - + - + - + - + sys/tss.h - + - + lib/kmalloc.h - + - + vfs/vfs.h - + - + - + - + - + - + vfs/mount.h - - - + - + lib/kprintf.h - + - + ubixos/ubthread.h - + - + - + - + ubixfs/dirCache.h - + - + src/sys/vfs/mount.c - + - + - + - + - + - + - + - + sys/sysproto.h - + - + - + ubixos/elf.h - + - + sys/signal.h - + - + ubixos/tty.h - + - + sys/io.h - + sys/device.h - + @@ -211,8 +209,8 @@ vitalsStruct::mountPoints - vfs_mountPoint::next - vfs_mountPoint::prev + vfs_mountPoint::next + vfs_mountPoint::prev systemVitals vfs_mount @@ -232,10 +230,10 @@ - vfs_mountPoint::mountPoint + vfs_mountPoint::mountPoint vitalsStruct::mountPoints - vfs_mountPoint::next - NULL + vfs_mountPoint::next + NULL strcmp systemVitals devfs_makeNode @@ -278,16 +276,16 @@ - vfs_mountPoint::device + vfs_mountPoint::device device_find - vfs_mountPoint::fs + vfs_mountPoint::fs kfree kmalloc kprintf - vfs_mountPoint::mountPoint - NULL - vfs_mountPoint::partition - vfs_mountPoint::perms + vfs_mountPoint::mountPoint + NULL + vfs_mountPoint::partition + vfs_mountPoint::perms sprintf vfs_addMount vfsFindFS @@ -353,7 +351,7 @@ structdevice_node*device=0x0; /*AllocateMemoryForMountPoint*/ -if((mp=(structvfs_mountPoint*)kmalloc(sizeof(structvfs_mountPoint)))==NULL) +if((mp=(structvfs_mountPoint*)kmalloc(sizeof(structvfs_mountPoint)))==NULL) kprintf("vfs_mount:failedtoallocatemp\n"); /*CopyMountPointIntoBuffer*/ @@ -442,7 +440,7 @@ } } /*ReturnNULLIfMountPointNotFound*/ -returnNULL; +returnNULL; } /*** diff --git a/doc/xml/mount_8h.xml b/doc/xml/mount_8h.xml index 3ae9898..b375702 100644 --- a/doc/xml/mount_8h.xml +++ b/doc/xml/mount_8h.xml @@ -3,7 +3,6 @@ mount.h ubixos/types.h - vfs/vfs.h src/sys/include/ubixos/vitals.h src/sys/include/vfs/file.h src/sys/include/vfs/vfs.h @@ -13,619 +12,523 @@ src/sys/ubixfs/directory.c src/sys/vfs/mount.c - - sys/thread.h - - - - - + ubixos/types.h - + - + sys/_types.h - - vfs/file.h - - - - - - - - - - vfs/vfs.h - - - - - - - - - - - - - + src/sys/include/vfs/mount.h - - - - - - - ubixfs/dirCache.h - - - - - - sys/sysproto.h - - - - - - - - sys/signal.h - - + - + src/sys/ufs/ffs.c - + src/sys/include/ufs/ufs.h - + - + - + - + src/sys/include/ubixos/sched.h - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - + - + src/sys/pci/hd.c - - src/sys/net/netif/tcpdump.c - - - + src/sys/include/ufs/ffs.h - + - + - + src/sys/include/ubixos/endtask.h - + - + - + - + - + - + - + - + - - - + - - src/sys/net/net/sys_arch.c - - - + src/sys/kernel/vitals.c - + src/sys/include/devfs/devfs.h - + - + - + - + - + src/sys/mpi/message.c - + src/sys/kmods/kmod.c - + src/sys/mpi/system.c - + src/sys/kernel/kern_sysctl.c - + src/sys/include/ubixos/vitals.h - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + src/sys/kernel/pipe.c - + src/sys/lib/kmalloc.c - + src/sys/vmm/paging.c - + src/sys/ubixfs/directory.c - + src/sys/ufs/ufs.c - + src/sys/kernel/kern_sig.c - + src/sys/kernel/ubthread.c - + src/sys/kernel/systemtask.c - - src/sys/net/netif/ethernetif.c - - - + src/sys/lib/ogprintf.cc - + src/sys/kernel/ld.c - + src/sys/include/vfs/file.h - + - + - + - + - + - + - + - + - - - + - + src/sys/kernel/fork.c - - src/sys/net/api/tcpip.c - - - + src/sys/ubixfs/block.c - + src/sys/kernel/sched.c - - src/sys/net/net/shell.c - - - + src/sys/include/mpi/mpi.h - + - + - + - + - + - + src/sys/include/ubixos/fork.h - - - + - + src/sys/ubixfs/dirCache.c - + src/sys/ubixfs/ubixfs.c - - src/sys/net/net/init.c - - - + src/sys/include/vfs/vfs.h - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + - + src/sys/include/vfs/mount.h - + - + - + - + - + - + - + - + - + src/sys/init/main.c - + src/sys/include/ubixfs/ubixfs.h - + - + - + - + - + - + - + - + - + src/sys/kernel/bioscall.c - + src/sys/include/sys/kern_descrip.h - + - + - + - + - + - + src/sys/include/ubixos/ubthread.h - + - - - + - + src/sys/kernel/syscall.c - + src/sys/isa/ne2k.c - + src/sys/include/ubixos/exec.h - + - + - + - + - + - - - - - + - + src/sys/include/ubixos/syscalls.h - + - + src/sys/include/pci/hd.h - + - + - + src/sys/isa/atkbd.c - + src/sys/vmm/pagefault.c - + src/sys/ubixfs/thread.c - + src/sys/include/ubixos/init.h - - + + - + src/sys/vfs/mount.c - + src/sys/devfs/devfs.c - + src/sys/kernel/time.c - + src/sys/vmm/vmm_memory.c - + src/sys/kernel/spinlock.c - + src/sys/kernel/kern_descrip.c - + src/sys/kernel/endtask.c - + src/sys/vfs/file.c - + src/sys/sys/idt.c - + src/sys/kernel/gen_calls.c - + src/sys/kernel/syscall_new.c - + src/sys/kernel/exec.c - + src/sys/include/sys/buf.h - + - + src/sys/isa/fdc.c - + src/sys/vmm/getfreevirtualpage.c - + src/sys/vfs/vfs.c @@ -647,10 +550,10 @@ - + vitalsStruct::mountPoints - vfs_mountPoint::next - vfs_mountPoint::prev + vfs_mountPoint::next + vfs_mountPoint::prev systemVitals vfs_mount @@ -669,11 +572,11 @@ - - vfs_mountPoint::mountPoint + + vfs_mountPoint::mountPoint vitalsStruct::mountPoints - vfs_mountPoint::next - NULL + vfs_mountPoint::next + NULL strcmp systemVitals devfs_makeNode @@ -715,17 +618,17 @@ - - vfs_mountPoint::device + + vfs_mountPoint::device device_find - vfs_mountPoint::fs + vfs_mountPoint::fs kfree kmalloc kprintf - vfs_mountPoint::mountPoint - NULL - vfs_mountPoint::partition - vfs_mountPoint::perms + vfs_mountPoint::mountPoint + NULL + vfs_mountPoint::partition + vfs_mountPoint::perms sprintf vfs_addMount vfsFindFS @@ -773,29 +676,28 @@ #define_MOUNT_H #include<ubixos/types.h> -#include<vfs/vfs.h> - -structvfs_mountPoint{ -structvfs_mountPoint*prev; -structvfs_mountPoint*next; -structfileSystem*fs; -structdevice_node*device; -structubixDiskLabel*diskLabel; -void*fsInfo; -intpartition; -charmountPoint[1024]; -charperms; -}; - -intvfs_mount(intmajor,intminor,intpartition,intfsType,char*mountPoint,char*perms); -intvfs_addMount(structvfs_mountPoint*mp); -structvfs_mountPoint*vfs_findMount(char*mountPoint); - -#endif - -/*** -END -***/ + +structvfs_mountPoint{ +structvfs_mountPoint*prev; +structvfs_mountPoint*next; +structfileSystem*fs; +structdevice_node*device; +structubixDiskLabel*diskLabel; +void*fsInfo; +intpartition; +charmountPoint[1024]; +charperms; +}; + +intvfs_mount(intmajor,intminor,intpartition,intfsType,char*mountPoint,char*perms); +intvfs_addMount(structvfs_mountPoint*mp); +structvfs_mountPoint*vfs_findMount(char*mountPoint); + +#endif + +/*** +END +***/ diff --git a/doc/xml/mouse_8c.xml b/doc/xml/mouse_8c.xml index 8c3b266..691b89a 100644 --- a/doc/xml/mouse_8c.xml +++ b/doc/xml/mouse_8c.xml @@ -10,64 +10,64 @@ lib/kprintf.h ubixos/types.h - + ubixos/types.h - + - + sys/_types.h - + isa/mouse.h - + sys/idt.h - + - + - + lib/kprintf.h - + - + sys/gdt.h - + sys/io.h - + isa/8259.h - + - + src/sys/isa/mouse.c - + - + - + - + - + - + - + @@ -191,7 +191,7 @@ dInt dPresent eoi - irqEnable + irqEnable kbdRead kbdWrite kbdWriteRead diff --git a/doc/xml/mouse_8h.xml b/doc/xml/mouse_8h.xml index f01ed01..f0370e2 100644 --- a/doc/xml/mouse_8h.xml +++ b/doc/xml/mouse_8h.xml @@ -4,13 +4,13 @@ mouse.h src/sys/isa/mouse.c - + src/sys/include/isa/mouse.h - + - + src/sys/isa/mouse.c @@ -62,7 +62,7 @@ dInt dPresent eoi - irqEnable + irqEnable kbdRead kbdWrite kbdWriteRead diff --git a/doc/xml/mpi_8h.xml b/doc/xml/mpi_8h.xml index 32080b1..75975c7 100644 --- a/doc/xml/mpi_8h.xml +++ b/doc/xml/mpi_8h.xml @@ -10,208 +10,178 @@ src/sys/mpi/message.c src/sys/mpi/system.c - + sys/thread.h - + - + ubixos/sched.h - + - + - + - + - + - + - + ubixos/types.h - + - + sys/_types.h - + vfs/file.h - + - + - + - + sys/tss.h - + - + src/sys/include/mpi/mpi.h - + - + - - vfs/vfs.h - - - - - - - - - - - - - + vfs/mount.h - - - + - + ubixfs/dirCache.h - + - - sys/sysproto.h - - - - - - - + ubixos/elf.h - + - - sys/signal.h - - - - - + ubixos/tty.h - + - + src/sys/pci/hd.c - + src/sys/mpi/message.c - + src/sys/mpi/system.c - + src/sys/ubixfs/directory.c - + src/sys/kernel/systemtask.c - + src/sys/ubixfs/block.c - + src/sys/include/mpi/mpi.h - + - + - + - + - + - + src/sys/ubixfs/dirCache.c - + src/sys/ubixfs/ubixfs.c - + src/sys/init/main.c - + src/sys/include/ubixfs/ubixfs.h - + - + - + - + - + - + - + - + - + src/sys/kernel/syscall.c - + src/sys/include/pci/hd.h - + - + - + src/sys/ubixfs/thread.c - + src/sys/include/ubixos/init.h - - + + @@ -280,10 +250,12 @@ _current taskStruct::id kmalloc - mbox mboxList mpi_findMbox mpiSpinLock + mpi_mbox::name + mpi_mbox::next + mpi_mbox::pid mpi_mbox::prev spinLock spinUnlock @@ -310,9 +282,12 @@ _current taskStruct::id kfree - mbox mboxList mpiSpinLock + mpi_mbox::name + mpi_mbox::next + mpi_mbox::pid + mpi_mbox::prev spinLock spinUnlock strcmp @@ -337,15 +312,17 @@ _current - mpi_message::data + mpi_message::data mpi_message::header taskStruct::id kfree - mbox memcpy MESSAGE_LENGTH mpi_findMbox mpiSpinLock + mpi_mbox::msg + mpi_message::next + mpi_mbox::pid mpi_message::pid spinLock spinUnlock @@ -375,15 +352,16 @@ _current - mpi_message::data + mpi_message::data mpi_message::header taskStruct::id kmalloc - mbox memcpy MESSAGE_LENGTH mpi_findMbox mpiSpinLock + mpi_mbox::msg + mpi_mbox::msgLast mpi_message::next mpi_message::pid spinLock @@ -409,14 +387,16 @@ - mpi_message::data + mpi_message::data mpi_message::header kmalloc - mbox mboxList memcpy MESSAGE_LENGTH mpiSpinLock + mpi_mbox::msg + mpi_mbox::msgLast + mpi_mbox::next mpi_message::next spinLock spinUnlock @@ -466,7 +446,7 @@ #defineMESSAGE_LENGTH248 structmpi_message{ -chardata[MESSAGE_LENGTH]; +chardata[MESSAGE_LENGTH]; uInt32header; pidTypepid; structmpi_message*next; diff --git a/doc/xml/ne2k_8c.xml b/doc/xml/ne2k_8c.xml index a839bfc..338b8fd 100644 --- a/doc/xml/ne2k_8c.xml +++ b/doc/xml/ne2k_8c.xml @@ -15,232 +15,230 @@ ubixos/spinlock.h assert.h - + sys/thread.h - + - + ubixos/kpanic.h - + ubixos/sched.h - + - + - + - + - + - + - + ubixos/spinlock.h - + - + sys/device.old.h - + - + isa/ne2k.h - + - + - + ubixos/vitals.h - + - + - + - + - + ubixos/types.h - + - + sys/_types.h - + string.h - + - + ubixos/time.h - + - + - + vfs/file.h - + - + - + - + sys/tss.h - + - + lib/kmalloc.h - + - + sys/idt.h - + - + - + vfs/vfs.h - + - + - + - + - + - + vfs/mount.h - - - + - + lib/kprintf.h - + - + sys/gdt.h - + assert.h - + ubixos/ubthread.h - + - + - + - + ubixfs/dirCache.h - + - + src/sys/isa/ne2k.c - + - + - + - + - + - + - + - + - + - + - + - + - + sys/sysproto.h - + - + - + ubixos/elf.h - + - + sys/signal.h - + - + ubixos/tty.h - + - + sys/io.h - + isa/8259.h - + @@ -286,14 +284,12 @@ nicBuffer::buffer - dev DP_PAGESIZE kprintf ne2kAllocBuffer NICtoPC OK stopPage - tmpBuf dp_recv @@ -312,7 +308,6 @@ - dev dp_pkt2user getblock inportByte @@ -362,7 +357,6 @@ - dev DP_PAGESIZE E8390_RREAD E8390_START @@ -408,7 +402,7 @@ inportByte device::ioAddr device::irq - irqEnable + irqEnable kmalloc kprintf mDev @@ -455,7 +449,6 @@ nicBuffer::next spinLock spinUnlock - tmpBuf dp_pkt2user @@ -476,7 +469,6 @@ nicBuffer::buffer kfree - ethernetif_thread nicBuffer * @@ -493,9 +485,7 @@ ne2k_spinLock ne2kBuffer nicBuffer::next - tmpBuf x1 - ethernetif_thread void @@ -513,8 +503,8 @@ eoi inportByte device::ioAddr - irqDisable - irqEnable + irqDisable + irqEnable kprintf mDev mPic @@ -554,7 +544,6 @@ assert - dev EN0_ISR EN0_RCNTHI EN0_RCNTLO @@ -591,7 +580,6 @@ assert - dev E8390_RWRITE E8390_START EN0_ISR @@ -605,7 +593,6 @@ NE_DATAPORT outportByte outportWord - low_level_output @@ -708,8 +695,8 @@ staticspinLock_tne2k_spinLock=SPIN_LOCK_INITIALIZER; -staticintdp_pkt2user(structdevice*dev,intpage,intlength); -staticvoidgetblock(structdevice*dev,intpage,size_toffset,size_tsize,void*dst); +staticintdp_pkt2user(structdevice*dev,intpage,intlength); +staticvoidgetblock(structdevice*dev,intpage,size_toffset,size_tsize,void*dst); staticintdp_recv(structdevice*); staticstructnicBuffer*ne2kBuffer=0x0; @@ -777,13 +764,13 @@ return(0x0); } -intPCtoNIC(structdevice*dev,void*packet,intlength){ +intPCtoNIC(structdevice*dev,void*packet,intlength){ inti=0x0; uInt16*packet16=(uInt16*)packet; uInt8*packet8=(uInt8*)packet; uInt8word16=0x1; -if((inportByte(dev->ioAddr)&0x04)==0x04){ +if((inportByte(dev->ioAddr)&0x04)==0x04){ kpanic("DeviceNotReady\n"); } @@ -792,41 +779,41 @@ length++; } -outportByte(dev->ioAddr+EN0_RCNTLO,(length&0xFF)); -outportByte(dev->ioAddr+EN0_RCNTHI,(length>>8)); +outportByte(dev->ioAddr+EN0_RCNTLO,(length&0xFF)); +outportByte(dev->ioAddr+EN0_RCNTHI,(length>>8)); -outportByte(dev->ioAddr+EN0_RSARLO,0x0); -outportByte(dev->ioAddr+EN0_RSARHI,0x41); +outportByte(dev->ioAddr+EN0_RSARLO,0x0); +outportByte(dev->ioAddr+EN0_RSARHI,0x41); -outportByte(dev->ioAddr,E8390_RWRITE+E8390_START); +outportByte(dev->ioAddr,E8390_RWRITE+E8390_START); if(word16!=0x0){ for(i=0;i<length/2;i++){ -outportWord(dev->ioAddr+NE_DATAPORT,packet16[i]); +outportWord(dev->ioAddr+NE_DATAPORT,packet16[i]); } } else{ for(i=0;i<length;i++){ -outportByte(dev->ioAddr+NE_DATAPORT,packet8[i]); +outportByte(dev->ioAddr+NE_DATAPORT,packet8[i]); } } for(i=0;i<=100;i++){ -if((inportByte(dev->ioAddr+EN0_ISR)&0x40)==0x40){ +if((inportByte(dev->ioAddr+EN0_ISR)&0x40)==0x40){ break; } } -outportByte(dev->ioAddr+EN0_ISR,0x40); -outportByte(dev->ioAddr+EN0_TPSR,0x41);//ei_local->txStartPage); -outportByte(dev->ioAddr+0x05,(length&0xFF)); -outportByte(dev->ioAddr+0x06,(length>>8)); -outportByteP(dev->ioAddr,0x26); +outportByte(dev->ioAddr+EN0_ISR,0x40); +outportByte(dev->ioAddr+EN0_TPSR,0x41);//ei_local->txStartPage); +outportByte(dev->ioAddr+0x05,(length&0xFF)); +outportByte(dev->ioAddr+0x06,(length>>8)); +outportByteP(dev->ioAddr,0x26); //kprintf("SENT\n"); return(length); } -intNICtoPC(structdevice*dev,void*packet,intlength,intnic_addr){ +intNICtoPC(structdevice*dev,void*packet,intlength,intnic_addr){ inti=0x0; uInt16*packet16=(uInt16*)packet; @@ -837,19 +824,19 @@ -outportByte(dev->ioAddr+EN0_RCNTLO,(length&0xFF)); -outportByte(dev->ioAddr+EN0_RCNTHI,(length>>8)); +outportByte(dev->ioAddr+EN0_RCNTLO,(length&0xFF)); +outportByte(dev->ioAddr+EN0_RCNTHI,(length>>8)); -outportByte(dev->ioAddr+EN0_RSARLO,nic_addr&0xFF); -outportByte(dev->ioAddr+EN0_RSARHI,nic_addr>>8); +outportByte(dev->ioAddr+EN0_RSARLO,nic_addr&0xFF); +outportByte(dev->ioAddr+EN0_RSARHI,nic_addr>>8); -outportByte(dev->ioAddr,0x0A); +outportByte(dev->ioAddr,0x0A); for(i=0;i<length/2;i++){ -packet16[i]=inportWord(dev->ioAddr+NE_DATAPORT); +packet16[i]=inportWord(dev->ioAddr+NE_DATAPORT); } -outportByte(dev->ioAddr+EN0_ISR,0x40); +outportByte(dev->ioAddr+EN0_ISR,0x40); return(length); } @@ -885,7 +872,7 @@ return; } -staticintdp_recv(structdevice*dev){ +staticintdp_recv(structdevice*dev){ dp_rcvhdr_theader; unsignedintpageno=0x0,curr=0x0,next=0x0; intpacket_processed=0x0,r=0x0; @@ -893,16 +880,16 @@ uInt32length=0x0; -pageno=inportByte(dev->ioAddr+NE_BNRY)+1; +pageno=inportByte(dev->ioAddr+NE_BNRY)+1; if(pageno==stopPage)pageno=startPage; do{ -outportByte(dev->ioAddr+NE_CMD,0x40); -curr=inportByte(dev->ioAddr+NE_CURRENT); -outportByte(dev->ioAddr,0x0); +outportByte(dev->ioAddr+NE_CMD,0x40); +curr=inportByte(dev->ioAddr+NE_CURRENT); +outportByte(dev->ioAddr,0x0); if(curr==pageno)break; -getblock(dev,pageno,(size_t)0,sizeof(header),&header); -getblock(dev,pageno,sizeof(header)+2*sizeof(ether_addr_t),sizeof(eth_type),&eth_type); +getblock(dev,pageno,(size_t)0,sizeof(header),&header); +getblock(dev,pageno,sizeof(header)+2*sizeof(ether_addr_t),sizeof(eth_type),&eth_type); length=(header.dr_rbcl|(header.dr_rbch<<8))-sizeof(dp_rcvhdr_t); next=header.dr_next; @@ -922,7 +909,7 @@ next=curr; } elseif(header.dr_status&RSR_PRX){ -r=dp_pkt2user(dev,pageno,length); +r=dp_pkt2user(dev,pageno,length); if(r!=OK){ kprintf("FRUIT"); return(0x0); @@ -931,9 +918,9 @@ packet_processed=0x1; } if(next==startPage) -outportByte(dev->ioAddr+NE_BNRY,stopPage-1); +outportByte(dev->ioAddr+NE_BNRY,stopPage-1); else -outportByte(dev->ioAddr+NE_BNRY,next-1); +outportByte(dev->ioAddr+NE_BNRY,next-1); pageno=next; @@ -941,27 +928,27 @@ return(0x0); } -staticvoidgetblock(structdevice*dev,intpage,size_toffset,size_tsize,void*dst){ +staticvoidgetblock(structdevice*dev,intpage,size_toffset,size_tsize,void*dst){ uInt16*ha=0x0; inti=0x0; ha=(uInt16*)dst; offset=page*DP_PAGESIZE+offset; -outportByte(dev->ioAddr+NE_RBCR0,size&0xFF); -outportByte(dev->ioAddr+NE_RBCR1,size>>8); -outportByte(dev->ioAddr+EN0_RSARLO,offset&0xFF); -outportByte(dev->ioAddr+EN0_RSARHI,offset>>8); -outportByte(dev->ioAddr+NE_CMD,E8390_RREAD|E8390_START); +outportByte(dev->ioAddr+NE_RBCR0,size&0xFF); +outportByte(dev->ioAddr+NE_RBCR1,size>>8); +outportByte(dev->ioAddr+EN0_RSARLO,offset&0xFF); +outportByte(dev->ioAddr+EN0_RSARHI,offset>>8); +outportByte(dev->ioAddr+NE_CMD,E8390_RREAD|E8390_START); size/=2; for(i=0;i<size;i++) -ha[i]=inportWord(dev->ioAddr+NE_DATAPORT); -outportByte(dev->ioAddr+EN0_ISR,0x40); +ha[i]=inportWord(dev->ioAddr+NE_DATAPORT); +outportByte(dev->ioAddr+EN0_ISR,0x40); } -staticintdp_pkt2user(structdevice*dev,intpage,intlength){ +staticintdp_pkt2user(structdevice*dev,intpage,intlength){ intlast=0x0; -structnicBuffer*tmpBuf=0x0; +structnicBuffer*tmpBuf=0x0; last=page+(length-1)/DP_PAGESIZE; @@ -969,14 +956,14 @@ kprintf("FOOKSTOPPAGE!!!"); } else{ -tmpBuf=ne2kAllocBuffer(length); -NICtoPC(dev,tmpBuf->buffer,length,page*DP_PAGESIZE+sizeof(dp_rcvhdr_t)); +tmpBuf=ne2kAllocBuffer(length); +NICtoPC(dev,tmpBuf->buffer,length,page*DP_PAGESIZE+sizeof(dp_rcvhdr_t)); } return(OK); } structnicBuffer*ne2kAllocBuffer(intlength){ -structnicBuffer*tmpBuf=0x0; +structnicBuffer*tmpBuf=0x0; spinLock(&ne2k_spinLock); @@ -989,30 +976,30 @@ return(ne2kBuffer); } else{ -for(tmpBuf=ne2kBuffer;tmpBuf->next!=0x0;tmpBuf=tmpBuf->next); +for(tmpBuf=ne2kBuffer;tmpBuf->next!=0x0;tmpBuf=tmpBuf->next); -tmpBuf->next=(structnicBuffer*)kmalloc(sizeof(structnicBuffer)); -tmpBuf=tmpBuf->next; -tmpBuf->next=0x0; -tmpBuf->length=length; -tmpBuf->buffer=(char*)kmalloc(length); +tmpBuf->next=(structnicBuffer*)kmalloc(sizeof(structnicBuffer)); +tmpBuf=tmpBuf->next; +tmpBuf->next=0x0; +tmpBuf->length=length; +tmpBuf->buffer=(char*)kmalloc(length); spinUnlock(&ne2k_spinLock); -return(tmpBuf); +return(tmpBuf); } spinUnlock(&ne2k_spinLock); return(0x0); } structnicBuffer*ne2kGetBuffer(){ -structnicBuffer*tmpBuf=0x0; +structnicBuffer*tmpBuf=0x0; if(ne2k_spinLock==0x1) return(0x0); -tmpBuf=ne2kBuffer; +tmpBuf=ne2kBuffer; if(ne2kBuffer!=0x0) ne2kBuffer=ne2kBuffer->next; -return(tmpBuf); +return(tmpBuf); } voidne2kFreeBuffer(structnicBuffer*buf){ diff --git a/doc/xml/ne2k_8h.xml b/doc/xml/ne2k_8h.xml index 32d8eec..7832bfe 100644 --- a/doc/xml/ne2k_8h.xml +++ b/doc/xml/ne2k_8h.xml @@ -4,62 +4,55 @@ ne2k.h ubixos/types.h sys/device.old.h - src/sys/include/ubixos/init.h + src/sys/include/ubixos/init.h src/sys/isa/ne2k.c - src/sys/net/netif/ethernetif.c - + sys/device.old.h - + - + src/sys/include/isa/ne2k.h - + - + - + ubixos/types.h - + - + sys/_types.h - + src/sys/include/isa/ne2k.h - + - - - + - - src/sys/net/netif/ethernetif.c - - - + src/sys/init/main.c - + src/sys/isa/ne2k.c - + src/sys/include/ubixos/init.h - - + + @@ -595,7 +588,7 @@ ether_addr - ether_addr_t + ether_addr_t @@ -968,7 +961,7 @@ TX_PAGES - (dev->priv->pingPong ? TX_2X_PAGES : TX_1X_PAGES) + (dev->priv->pingPong ? TX_2X_PAGES : TX_1X_PAGES) @@ -992,11 +985,11 @@ - + etheraddr - typedef union etheraddr ether_addr + typedef union etheraddr ether_addr_t - ether_addr + ether_addr_t @@ -1037,7 +1030,7 @@ inportByte device::ioAddr device::irq - irqEnable + irqEnable kmalloc kprintf mDev @@ -1083,7 +1076,6 @@ nicBuffer::next spinLock spinUnlock - tmpBuf dp_pkt2user @@ -1119,7 +1111,6 @@ nicBuffer::buffer kfree - ethernetif_thread nicBuffer * @@ -1136,9 +1127,7 @@ ne2k_spinLock ne2kBuffer nicBuffer::next - tmpBuf x1 - ethernetif_thread void @@ -1156,8 +1145,8 @@ eoi inportByte device::ioAddr - irqDisable - irqEnable + irqDisable + irqEnable kprintf mDev mPic @@ -1230,7 +1219,6 @@ assert - dev EN0_ISR EN0_RCNTHI EN0_RCNTLO @@ -1288,7 +1276,6 @@ assert - dev E8390_RWRITE E8390_START EN0_ISR @@ -1302,7 +1289,6 @@ NE_DATAPORT outportByte outportWord - low_level_output @@ -1385,7 +1371,7 @@ typedefunionetheraddr{ unsignedcharbytes[6];/*byteordersafeinitialization*/ unsignedshortshorts[3];/*force2-bytealignment*/ -}ether_addr; +}ether_addr; structnicBuffer{ @@ -1500,13 +1486,13 @@ intne2k_init(); intne2kProbe(int,structdevice*); intne2kDevInit(structdevice*); -voidNS8390_init(structdevice*dev,intstartp); +voidNS8390_init(structdevice*dev,intstartp); voidne2kISR(); voidne2kHandler(); -intNICtoPC(structdevice*dev,void*packet,intlength,intnic_addr); -intPCtoNIC(structdevice*dev,void*packet,intlength); +intNICtoPC(structdevice*dev,void*packet,intlength,intnic_addr); +intPCtoNIC(structdevice*dev,void*packet,intlength); structnicBuffer*ne2kAllocBuffer(int); structnicBuffer*ne2kGetBuffer(); diff --git a/doc/xml/net_8c.xml b/doc/xml/net_8c.xml index ac32b53..527d66b 100644 --- a/doc/xml/net_8c.xml +++ b/doc/xml/net_8c.xml @@ -3,48 +3,45 @@ net.c ubixos/types.h - net/sockets.h + net/sockets.h string.h lib/kprintf.h - + src/sys/lib/net.c - + - + - + - + - + + net/sockets.h + + ubixos/types.h - + - + sys/_types.h - + string.h - + - + lib/kprintf.h - - - - - net/sockets.h - - + @@ -89,9 +86,6 @@ memcpy - loopif_output - low_level_input - low_level_output void @@ -131,6 +125,7 @@ + inet_aton uInt32 @@ -159,7 +154,7 @@ cp - struct in_addr * + struct in_addr * addr @@ -169,10 +164,9 @@ - htonl + htonl kprintf - NULL - in_addr::s_addr + NULL strtol @@ -258,7 +252,7 @@ *****************************************************************************************/ #include<ubixos/types.h> -#include<net/sockets.h> +#include<net/sockets.h> #include<string.h> #include"lib/kprintf.h" @@ -268,7 +262,7 @@ #define_IN_ADDR_T_DECLARED #endif -uInt32htonl(uInt32n){ +uInt32htonl(uInt32n){ uInt32retVal=0x0; retVal+=((n&0xff)<<24); retVal+=((n&0xff00)<<8); @@ -277,24 +271,24 @@ return(retVal); } -uInt32htons(uInt32n){ +uInt32htons(uInt32n){ uInt32retVal=0x0; retVal=(((n&0xff)<<8)|((n&0xff00)>>8)); return(retVal); } -voidbcopy(constvoid*src,void*dest,intlen){ +voidbcopy(constvoid*src,void*dest,intlen){ memcpy(dest,src,len); } -voidbzero(void*data,intn){ +voidbzero(void*data,intn){ memset(data,0,n); } intinet_aton(cp,addr) constchar*cp; -structin_addr*addr; +structin_addr*addr; { uInt32parts[4]; in_addr_tval; @@ -386,8 +380,8 @@ break; } -if(addr!=NULL) -addr->s_addr=htonl(val); +if(addr!=NULL) +addr->s_addr=htonl(val); return(1); } diff --git a/doc/xml/ogDisplay__UbixOS_8h.xml b/doc/xml/ogDisplay__UbixOS_8h.xml index 35cccff..92f784f 100644 --- a/doc/xml/ogDisplay__UbixOS_8h.xml +++ b/doc/xml/ogDisplay__UbixOS_8h.xml @@ -5,25 +5,25 @@ objgfx40/objgfx40.h src/sys/lib/ogprintf.cc - + objgfx40/objgfx40.h - + src/sys/include/sde/ogDisplay_UbixOS.h - + - + src/sys/lib/ogprintf.cc - + src/sys/include/sde/ogDisplay_UbixOS.h - + diff --git a/doc/xml/ogprintf_8cc.xml b/doc/xml/ogprintf_8cc.xml index dbda76a..1950cde 100644 --- a/doc/xml/ogprintf_8cc.xml +++ b/doc/xml/ogprintf_8cc.xml @@ -7,163 +7,161 @@ sde/ogDisplay_UbixOS.h ubixos/vitals.h - + sys/thread.h - + - + ubixos/sched.h - + - + - + - + - + - + - + objgfx40/ogFont.h - + ubixos/vitals.h - + - + - + - + - + ubixos/types.h - + - + sys/_types.h - + src/sys/lib/ogprintf.cc - + - + - + - + - + ubixos/time.h - + - + - + vfs/file.h - + - + - + - + sys/tss.h - + - + objgfx40/objgfx40.h - + vfs/vfs.h - + - + - + - + - + - + vfs/mount.h - - - + - + sde/ogDisplay_UbixOS.h - + - + ubixos/ubthread.h - + - + - + - + ubixfs/dirCache.h - + - + sys/sysproto.h - + - + - + ubixos/elf.h - + - + sys/signal.h - + - + ubixos/tty.h - + - + sys/io.h diff --git a/doc/xml/pagefault_8c.xml b/doc/xml/pagefault_8c.xml index e03f7ca..6ec8d58 100644 --- a/doc/xml/pagefault_8c.xml +++ b/doc/xml/pagefault_8c.xml @@ -8,154 +8,138 @@ ubixos/spinlock.h lib/kprintf.h - + sys/thread.h - + - + ubixos/kpanic.h - + ubixos/sched.h - + - + - + - + - + - + - + ubixos/spinlock.h - + - + ubixos/types.h - + - + sys/_types.h - + vmm/paging.h - + - + - + - + vfs/file.h - + - + - + - + sys/tss.h - + - + vmm/vmm.h - + - + - - vfs/vfs.h - - - - - - - - - - - - - + vfs/mount.h - - - + - + lib/kprintf.h - + - + ubixfs/dirCache.h - + - + src/sys/vmm/pagefault.c - + - + - + - + - + - + sys/sysproto.h - + - + - + ubixos/elf.h - + - + sys/signal.h - + - + ubixos/tty.h - + diff --git a/doc/xml/paging_8c.xml b/doc/xml/paging_8c.xml index 23b4f80..90d8e8f 100644 --- a/doc/xml/paging_8c.xml +++ b/doc/xml/paging_8c.xml @@ -12,178 +12,162 @@ string.h assert.h - + sys/thread.h - + - + ubixos/kpanic.h - + ubixos/sched.h - + - + - + - + - + - + - + ubixos/spinlock.h - + - + src/sys/vmm/paging.c - + - + - + - + - + - + - + - + - + - + ubixos/types.h - + - + sys/_types.h - + vmm/paging.h - + - + - + - + string.h - + - + vfs/file.h - + - + - + - + sys/tss.h - + - + lib/kmalloc.h - + - + vmm/vmm.h - + - + - - vfs/vfs.h - - - - - - - - - - - - - + vfs/mount.h - - - + - + lib/kprintf.h - + - + assert.h - + ubixfs/dirCache.h - + - + sys/sysproto.h - + - + - + ubixos/elf.h - + - + sys/signal.h - + - + ubixos/tty.h - + diff --git a/doc/xml/paging_8h.xml b/doc/xml/paging_8h.xml index 4508ee2..7fcbc22 100644 --- a/doc/xml/paging_8h.xml +++ b/doc/xml/paging_8h.xml @@ -8,205 +8,205 @@ src/sys/include/vmm/vmm.h src/sys/vfs/file.c - + sys/thread.h - + - + ubixos/types.h - + - + sys/_types.h - + src/sys/include/vmm/paging.h - + - + - + - + sys/sysproto.h - + - + - + sys/signal.h - + - + src/sys/kmods/kmod.c - + src/sys/lib/kmalloc.c - + src/sys/vmm/paging.c - + src/sys/kernel/systemtask.c - + src/sys/include/vmm/paging.h - + - + - + src/sys/kernel/ld.c - + src/sys/kernel/fork.c - + src/sys/vmm/createvirtualspace.c - + src/sys/vmm/vmm_init.c - + src/sys/kernel/sched.c - + src/sys/include/vmm/vmm.h - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + src/sys/vmm/setpageattributes.c - + src/sys/vmm/getphysicaladdr.c - + src/sys/init/main.c - + src/sys/kernel/bioscall.c - + src/sys/kernel/syscall.c - + src/sys/vmm/pagefault.c - + src/sys/include/ubixos/init.h - - + + - + src/sys/vmm/unmappage.c - + src/sys/vmm/vmm_memory.c - + src/sys/kernel/endtask.c - + src/sys/vfs/file.c - + src/sys/vmm/getfreepage.c - + src/sys/sys/idt.c - + src/sys/kernel/exec.c - + src/sys/vmm/getfreevirtualpage.c - + src/sys/vmm/copyvirtualspace.c diff --git a/doc/xml/pci_8c.xml b/doc/xml/pci_8c.xml index 5682fbf..615feb1 100644 --- a/doc/xml/pci_8c.xml +++ b/doc/xml/pci_8c.xml @@ -7,41 +7,41 @@ ubixos/types.h lib/kprintf.h - + pci/pci.h - + - + src/sys/pci/pci.c - + - + - + - + - + ubixos/types.h - + - + sys/_types.h - + lib/kprintf.h - + - + sys/io.h @@ -62,13 +62,13 @@ pciConfig::baseClass confadd::bus countof - dev + confadd::dev confadd::func pciConfig::interface pciConfig::irq kprintf name - pciClasses + pciClasses pciProbe pciConfig::subClass TRUE @@ -250,13 +250,11 @@ def_ctls initHardDisk lookup - lwip_bind - lwip_connect pci_init - - @13 - struct @13 pciClasses[] + + @7 + struct @7 pciClasses[] [] pciClasses @@ -326,7 +324,7 @@ uInt8subClass; uInt8interface; constchar*name; -}pciClasses[]={ +}pciClasses[]={ {0x00,0x00,0x00,"Undefined"}, {0x00,0x01,0x00,"VGA"}, @@ -468,7 +466,7 @@ }; -uInt32pciRead(intbus,intdev,intfunc,intreg,intbytes){ +uInt32pciRead(intbus,intdev,intfunc,intreg,intbytes){ uInt16base; union{ @@ -496,7 +494,7 @@ } } -voidpciWrite(intbus,intdev,intfunc,intreg,uInt32v,intbytes){ +voidpciWrite(intbus,intdev,intfunc,intreg,uInt32v,intbytes){ uInt16base; union{ @@ -522,7 +520,7 @@ } -boolpciProbe(intbus,intdev,intfunc,structpciConfig*cfg){ +boolpciProbe(intbus,intdev,intfunc,structpciConfig*cfg){ uInt32*word=(uInt32*)cfg; uInt32v; inti; @@ -579,7 +577,7 @@ } intpci_init(){ -uInt16bus,dev,func; +uInt16bus,dev,func; inti=0x0; structpciConfigpcfg; for(bus=0x0;bus<0x2;bus++){/*255*/ @@ -587,7 +585,7 @@ for(func=0;func<8;func++){ if(pciProbe(bus,dev,func,&pcfg)==TRUE){ /*kprintf("*Vendor:%XDevice:%XClass/SubClass/Interface%X/%X/%X\n",pcfg.vendorId,pcfg.deviceId,pcfg.baseClass,pcfg.subClass,pcfg.interface);*/ -for(i=0x0;i<countof(pciClasses);i++){ +for(i=0x0;i<countof(pciClasses);i++){ if(pcfg.baseClass==pciClasses[i].baseClass&&pcfg.subClass==pciClasses[i].subClass&&pcfg.interface==pciClasses[i].interface){ kprintf("PCIDevice:%s@IRQ:0x%X\n",pciClasses[i].name,pcfg.irq); break; diff --git a/doc/xml/pci_8h.xml b/doc/xml/pci_8h.xml index 63204d6..c794045 100644 --- a/doc/xml/pci_8h.xml +++ b/doc/xml/pci_8h.xml @@ -3,47 +3,47 @@ pci.h ubixos/types.h - src/sys/include/ubixos/init.h + src/sys/include/ubixos/init.h src/sys/pci/pci.c - + src/sys/include/pci/pci.h - + - + ubixos/types.h - + - + sys/_types.h - + src/sys/include/pci/pci.h - + - + - + src/sys/pci/pci.c - + src/sys/init/main.c - + src/sys/include/ubixos/init.h - - + + @@ -80,13 +80,13 @@ pciConfig::baseClass confadd::bus countof - dev + confadd::dev confadd::func pciConfig::interface pciConfig::irq kprintf name - pciClasses + pciClasses pciProbe pciConfig::subClass TRUE @@ -312,9 +312,9 @@ intpci_init(); -boolpciProbe(intbus,intdev,intfunc,structpciConfig*cfg); -uInt32pciRead(intbus,intdev,intfunc,intreg,intbytes); -voidpciWrite(intbus,intdev,intfunc,intreg,uInt32v,intbytes); +boolpciProbe(intbus,intdev,intfunc,structpciConfig*cfg); +uInt32pciRead(intbus,intdev,intfunc,intreg,intbytes); +voidpciWrite(intbus,intdev,intfunc,intreg,uInt32v,intbytes); #endif diff --git a/doc/xml/pipe_8c.xml b/doc/xml/pipe_8c.xml index 29be49f..683b0c9 100644 --- a/doc/xml/pipe_8c.xml +++ b/doc/xml/pipe_8c.xml @@ -10,118 +10,102 @@ lib/kprintf.h assert.h - + sys/thread.h - + - + src/sys/kernel/pipe.c - + - + - + - + - + - + - + - + ubixos/types.h - + - + sys/_types.h - + vfs/file.h - + - + - + - + sys/pipe.h - + - + - - vfs/vfs.h - - - - - - - - - - - - - + vfs/mount.h - - - + - + lib/kprintf.h - + - + sys/kern_descrip.h - + - + - + - + assert.h - + ubixfs/dirCache.h - + - + sys/sysproto.h - + - + - + sys/signal.h - + diff --git a/doc/xml/pipe_8h.xml b/doc/xml/pipe_8h.xml index 2aa14e2..5807cbd 100644 --- a/doc/xml/pipe_8h.xml +++ b/doc/xml/pipe_8h.xml @@ -6,54 +6,54 @@ sys/sysproto.h src/sys/kernel/pipe.c - + sys/thread.h - + - + ubixos/types.h - + - + sys/_types.h - + src/sys/include/sys/pipe.h - + - + - + sys/sysproto.h - + - + - + sys/signal.h - + - + src/sys/kernel/pipe.c - + src/sys/include/sys/pipe.h - + diff --git a/doc/xml/pit_8c.xml b/doc/xml/pit_8c.xml index b712ea1..91f83f3 100644 --- a/doc/xml/pit_8c.xml +++ b/doc/xml/pit_8c.xml @@ -6,37 +6,37 @@ sys/io.h lib/kprintf.h - + ubixos/types.h - + - + sys/_types.h - + src/sys/isa/pit.c - + - + - + - + lib/kprintf.h - + - + isa/pit.h - + sys/io.h diff --git a/doc/xml/pit_8h.xml b/doc/xml/pit_8h.xml index 1d58f3a..ed11c3a 100644 --- a/doc/xml/pit_8h.xml +++ b/doc/xml/pit_8h.xml @@ -2,29 +2,29 @@ pit.h - src/sys/include/ubixos/init.h + src/sys/include/ubixos/init.h src/sys/isa/pit.c - + src/sys/isa/pit.c - + src/sys/init/main.c - + src/sys/include/isa/pit.h - + - + - + src/sys/include/ubixos/init.h - - + + diff --git a/doc/xml/sched_8c.xml b/doc/xml/sched_8c.xml index 643a94e..73420e4 100644 --- a/doc/xml/sched_8c.xml +++ b/doc/xml/sched_8c.xml @@ -17,224 +17,208 @@ string.h assert.h - + sys/thread.h - + - + ubixos/kpanic.h - + ubixos/sched.h - + - + - + - + - + - + - + ubixos/endtask.h - + - + - + ubixos/spinlock.h - + - + ubixos/types.h - + - + sys/_types.h - + vmm/paging.h - + - + - + - + string.h - + - + vfs/file.h - + - + - + - + sys/tss.h - + - + lib/kmalloc.h - + - + vmm/vmm.h - + - + - + src/sys/kernel/sched.c - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + sys/idt.h - + - + - - vfs/vfs.h - - - - - - - - - - - - - + vfs/mount.h - - - + - + lib/kprintf.h - + - + sys/kern_descrip.h - + - + - + - + sys/gdt.h - + assert.h - + ubixfs/dirCache.h - + - + sys/sysproto.h - + - + - + ubixos/elf.h - + - + sys/signal.h - + - + ubixos/tty.h - + - + isa/8259.h - + @@ -468,7 +452,7 @@ NEW taskStruct::next nextID - thread::o_files + thread::o_files taskStruct::prev schedulerSpinLock spinLock @@ -527,7 +511,6 @@ mpi_destroyMbox mpi_fetchMessage mpi_postMessage - netMainThread obreak sched schedEndTask @@ -798,7 +781,7 @@ /*HACK*/ for(i=0;i<3;i++){ fp=kmalloc(sizeof(structfile)); -tmpTask->td.o_files[i]=(u_int32_t)fp; +tmpTask->td.o_files[i]=(u_int32_t)fp; fp->f_flag=0x4; } diff --git a/doc/xml/sched_8h.xml b/doc/xml/sched_8h.xml index 70ac833..4cc43ac 100644 --- a/doc/xml/sched_8h.xml +++ b/doc/xml/sched_8h.xml @@ -12,7 +12,7 @@ src/sys/include/ubixos/endtask.h src/sys/include/ubixos/exec.h src/sys/include/ubixos/fork.h - src/sys/include/ubixos/init.h + src/sys/include/ubixos/init.h src/sys/include/ubixos/syscalls.h src/sys/include/ubixos/ubthread.h src/sys/isa/atkbd.c @@ -30,9 +30,6 @@ src/sys/kernel/ubthread.c src/sys/kmods/kmod.c src/sys/lib/kmalloc.c - src/sys/net/net/init.c - src/sys/net/net/sys_arch.c - src/sys/net/netif/ethernetif.c src/sys/sys/idt.c src/sys/ubixfs/ubixfs.c src/sys/vfs/file.c @@ -40,499 +37,433 @@ src/sys/vmm/pagefault.c src/sys/vmm/paging.c - + sys/thread.h - + - + src/sys/include/ubixos/sched.h - + - + - + - + - + - + - + ubixos/types.h - + - + sys/_types.h - + vfs/file.h - + - + - + - + sys/tss.h - + - - vfs/vfs.h - - - - - - - - - - - - - + vfs/mount.h - - - + - + ubixfs/dirCache.h - + - - sys/sysproto.h - - - - - - - + ubixos/elf.h - + - - sys/signal.h - - - - - + ubixos/tty.h - + - + src/sys/include/ubixos/sched.h - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - + - + src/sys/pci/hd.c - + src/sys/include/ubixos/endtask.h - + - + - + - + - + - + - + - + - - - + - - src/sys/net/net/sys_arch.c - - - + src/sys/kernel/vitals.c - + src/sys/mpi/message.c - + src/sys/kmods/kmod.c - + src/sys/mpi/system.c - + src/sys/kernel/kern_sysctl.c - + src/sys/include/ubixos/vitals.h - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + src/sys/lib/kmalloc.c - + src/sys/vmm/paging.c - + src/sys/ubixfs/directory.c - + src/sys/kernel/kern_sig.c - + src/sys/kernel/ubthread.c - + src/sys/kernel/systemtask.c - - src/sys/net/netif/ethernetif.c - - - + src/sys/lib/ogprintf.cc - + src/sys/kernel/ld.c - + src/sys/kernel/fork.c - - src/sys/net/api/tcpip.c - - - + src/sys/ubixfs/block.c - + src/sys/kernel/sched.c - - src/sys/net/net/shell.c - - - + src/sys/include/mpi/mpi.h - + - + - + - + - + - + src/sys/include/ubixos/fork.h - - - + - + src/sys/ubixfs/dirCache.c - + src/sys/ubixfs/ubixfs.c - - src/sys/net/net/init.c - - - + src/sys/init/main.c - + src/sys/include/ubixfs/ubixfs.h - + - + - + - + - + - + - + - + - + src/sys/kernel/bioscall.c - + src/sys/include/ubixos/ubthread.h - + - - - + - + src/sys/kernel/syscall.c - + src/sys/isa/ne2k.c - + src/sys/include/ubixos/exec.h - + - + - + - + - + - - - - - + - + src/sys/include/ubixos/syscalls.h - + - + src/sys/include/pci/hd.h - + - + - + src/sys/isa/atkbd.c - + src/sys/vmm/pagefault.c - + src/sys/ubixfs/thread.c - + src/sys/include/ubixos/init.h - - + + - + src/sys/vfs/mount.c - + src/sys/kernel/time.c - + src/sys/vmm/vmm_memory.c - + src/sys/kernel/spinlock.c - + src/sys/kernel/kern_descrip.c - + src/sys/kernel/endtask.c - + src/sys/vfs/file.c - + src/sys/kernel/gen_calls.c - + src/sys/sys/idt.c - + src/sys/kernel/syscall_new.c - + src/sys/kernel/exec.c - + src/sys/vmm/getfreevirtualpage.c - + src/sys/vfs/vfs.c @@ -856,7 +787,7 @@ NEW taskStruct::next nextID - thread::o_files + thread::o_files taskStruct::prev schedulerSpinLock spinLock @@ -914,7 +845,6 @@ mpi_destroyMbox mpi_fetchMessage mpi_postMessage - netMainThread obreak sched schedEndTask diff --git a/doc/xml/sde_8h.xml b/doc/xml/sde_8h.xml index b66e5f4..df85de9 100644 --- a/doc/xml/sde_8h.xml +++ b/doc/xml/sde_8h.xml @@ -5,32 +5,32 @@ ubixos/types.h src/sys/kernel/systemtask.c - + ubixos/types.h - + - + sys/_types.h - + src/sys/include/sde/sde.h - + - + src/sys/kernel/systemtask.c - + src/sys/include/sde/sde.h - + diff --git a/doc/xml/sem_8c.xml b/doc/xml/sem_8c.xml index 98533d5..df96204 100644 --- a/doc/xml/sem_8c.xml +++ b/doc/xml/sem_8c.xml @@ -4,13 +4,13 @@ sem.c ubixos/sem.h - + src/sys/kernel/sem.c - + - + ubixos/sem.h diff --git a/doc/xml/sem_8h.xml b/doc/xml/sem_8h.xml index d7f3536..34e643d 100644 --- a/doc/xml/sem_8h.xml +++ b/doc/xml/sem_8h.xml @@ -4,14 +4,14 @@ sem.h src/sys/kernel/sem.c - + src/sys/kernel/sem.c - + src/sys/include/ubixos/sem.h - + diff --git a/doc/xml/setpageattributes_8c.xml b/doc/xml/setpageattributes_8c.xml index 1d83bbf..6ae78b7 100644 --- a/doc/xml/setpageattributes_8c.xml +++ b/doc/xml/setpageattributes_8c.xml @@ -5,64 +5,64 @@ vmm/vmm.h ubixos/kpanic.h - + sys/thread.h - + - + ubixos/kpanic.h - + ubixos/types.h - + - + sys/_types.h - + vmm/paging.h - + - + - + - + vmm/vmm.h - + - + - + src/sys/vmm/setpageattributes.c - + - + - + sys/sysproto.h - + - + - + sys/signal.h - + diff --git a/doc/xml/signal_8h.xml b/doc/xml/signal_8h.xml index 48766c4..186e395 100644 --- a/doc/xml/signal_8h.xml +++ b/doc/xml/signal_8h.xml @@ -5,721 +5,475 @@ ubixos/types.h src/sys/include/sys/sysproto.h - + ubixos/types.h - + - + sys/_types.h - + src/sys/include/sys/signal.h - + - + src/sys/ufs/ffs.c - + src/sys/include/ufs/ufs.h - + - + - + - - src/sys/include/ubixos/sched.h - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + src/sys/pci/hd.c - - src/sys/net/netif/tcpdump.c - - - + src/sys/include/ufs/ffs.h - + - + - - src/sys/include/ubixos/endtask.h - - - - - - - - - - - - - - - - - - - - - - - - src/sys/net/net/sys_arch.c - - - + src/sys/kernel/vitals.c - - src/sys/include/devfs/devfs.h - - - - - - - - - - - - src/sys/mpi/message.c - - - + src/sys/kmods/kmod.c - - src/sys/mpi/system.c - - - + src/sys/kernel/kern_sysctl.c - + src/sys/include/ubixos/vitals.h - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + src/sys/kernel/pipe.c - + src/sys/lib/kmalloc.c - + src/sys/vmm/paging.c - + src/sys/ubixfs/directory.c - + src/sys/ufs/ufs.c - + src/sys/kernel/kern_sig.c - + src/sys/kernel/ubthread.c - + src/sys/kernel/systemtask.c - - src/sys/net/netif/ethernetif.c - - - + src/sys/lib/ogprintf.cc - + src/sys/include/vmm/paging.h - + - + - + src/sys/kernel/ld.c - - src/sys/include/vfs/file.h - - - - - - - - - - - - - - - - - - - - - - - + src/sys/include/sys/pipe.h - + - + src/sys/kernel/fork.c - + src/sys/vmm/createvirtualspace.c - + src/sys/vmm/vmm_init.c - - src/sys/net/api/tcpip.c - - - + src/sys/ubixfs/block.c - + src/sys/include/sys/kern_sysctl.h - + - + - + - + src/sys/include/vmm/vmm.h - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + src/sys/kernel/sched.c - - src/sys/net/net/shell.c - - - + src/sys/vmm/setpageattributes.c - - src/sys/include/mpi/mpi.h - - - - - - - - - - - - - + src/sys/include/sys/gen_calls.h - + - + src/sys/vmm/getphysicaladdr.c - - src/sys/include/ubixos/fork.h - - - - - - - + src/sys/ubixfs/dirCache.c - + src/sys/ubixfs/ubixfs.c - - src/sys/net/net/init.c - - - + src/sys/include/vfs/vfs.h - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + - - src/sys/include/vfs/mount.h - - - - - - - - - - - - - - - - - - - + src/sys/init/main.c - + src/sys/include/ubixfs/ubixfs.h - + - + - + - + - + - + - + - + - + src/sys/kernel/bioscall.c - + src/sys/include/sys/kern_descrip.h - + - + - + - + - + - - src/sys/include/ubixos/ubthread.h - - - - - - - - - + src/sys/kernel/syscall.c - + src/sys/include/sys/kern_sig.h - + - + src/sys/isa/ne2k.c - - src/sys/include/ubixos/exec.h - - - - - - - - - - - - - - - - - - - - src/sys/include/ubixos/syscalls.h - - - - - + src/sys/include/pci/hd.h - + - + - + src/sys/isa/atkbd.c - + src/sys/vmm/pagefault.c - + src/sys/ubixfs/thread.c - + src/sys/include/ubixos/init.h - - + + - + src/sys/vfs/mount.c - + src/sys/devfs/devfs.c - + src/sys/include/sys/sysproto.h - + - + - + - + - + - + - + - + - + - + - + - + - + src/sys/vmm/unmappage.c - + src/sys/kernel/time.c - + src/sys/vmm/vmm_memory.c - - src/sys/kernel/spinlock.c - - - + src/sys/kernel/kern_descrip.c - + src/sys/include/sys/signal.h - + - + src/sys/kernel/endtask.c - + src/sys/vfs/file.c - + src/sys/vmm/getfreepage.c - + src/sys/sys/idt.c - + src/sys/kernel/gen_calls.c - + src/sys/kernel/syscall_new.c - + src/sys/kernel/exec.c - + src/sys/include/ubixos/syscalls_new.h - + - + src/sys/include/sys/buf.h - + - - src/sys/isa/fdc.c - - - + src/sys/vmm/getfreevirtualpage.c - + src/sys/vmm/copyvirtualspace.c - + src/sys/vfs/vfs.c @@ -882,7 +636,7 @@ #define_SIG_VALID(sig)((sig)<=_SIG_MAXSIG&&(sig)>0) typedefstruct__sigset{ -__uint32_t__bits[_SIG_WORDS]; +__uint32_t__bits[_SIG_WORDS]; }__sigset_t; typedef__sigset_tsigset_t; diff --git a/doc/xml/smp_8c.xml b/doc/xml/smp_8c.xml index 0af9d89..2589736 100644 --- a/doc/xml/smp_8c.xml +++ b/doc/xml/smp_8c.xml @@ -9,61 +9,61 @@ lib/string.h sys/io.h - + ubixos/kpanic.h - + ubixos/spinlock.h - + - + ubixos/smp.h - + - + ubixos/types.h - + - + sys/_types.h - + lib/string.h - + - + lib/kprintf.h - + - + src/sys/kernel/smp.c - + - + - + - + - + - + - + sys/io.h diff --git a/doc/xml/smp_8h.xml b/doc/xml/smp_8h.xml index 6a35693..308f324 100644 --- a/doc/xml/smp_8h.xml +++ b/doc/xml/smp_8h.xml @@ -5,31 +5,31 @@ ubixos/types.h src/sys/kernel/smp.c - + src/sys/include/ubixos/smp.h - + - + ubixos/types.h - + - + sys/_types.h - + src/sys/include/ubixos/smp.h - + - + src/sys/kernel/smp.c diff --git a/doc/xml/spinlock_8c.xml b/doc/xml/spinlock_8c.xml index 030e6aa..3c31841 100644 --- a/doc/xml/spinlock_8c.xml +++ b/doc/xml/spinlock_8c.xml @@ -5,120 +5,90 @@ ubixos/spinlock.h ubixos/sched.h - + sys/thread.h - + - + ubixos/sched.h - + - + - + - + - + - + - + ubixos/spinlock.h - + - + ubixos/types.h - + - + sys/_types.h - + vfs/file.h - + - + - + - + sys/tss.h - + - - vfs/vfs.h - - - - - - - - - - - - - + vfs/mount.h - - - + - + ubixfs/dirCache.h - + - - sys/sysproto.h - - - - - - - + ubixos/elf.h - + - + src/sys/kernel/spinlock.c - + - + - - sys/signal.h - - - - - + ubixos/tty.h - + @@ -143,7 +113,6 @@ spinTryLock adjustCowCounter cpuInfo - current_thread devfs_makeNode devfs_open device_add @@ -165,7 +134,6 @@ ne2kAllocBuffer schedNewTask smpInit - sys_thread_new tty_print ubixfs_cacheAdd ubixfs_cacheFind @@ -272,7 +240,6 @@ adjustCowCounter cpuInfo - current_thread devfs_makeNode devfs_open device_add @@ -295,7 +262,6 @@ ne2kAllocBuffer schedNewTask smpInit - sys_thread_new tty_print ubixfs_cacheAdd ubixfs_cacheFind diff --git a/doc/xml/spinlock_8h.xml b/doc/xml/spinlock_8h.xml index 2cdbddf..9fb320e 100644 --- a/doc/xml/spinlock_8h.xml +++ b/doc/xml/spinlock_8h.xml @@ -16,7 +16,6 @@ src/sys/kmods/kmod.c src/sys/lib/kmalloc.c src/sys/mpi/system.c - src/sys/net/net/sys_arch.c src/sys/sys/device.c src/sys/sys/video.c src/sys/ubixfs/dirCache.c @@ -28,169 +27,163 @@ src/sys/vmm/paging.c src/sys/vmm/vmm_memory.c - + src/sys/include/ubixos/spinlock.h - + - + ubixos/types.h - + - + sys/_types.h - + src/sys/include/ubixos/spinlock.h - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + - - src/sys/net/net/sys_arch.c - - - + src/sys/kernel/tty.c - + src/sys/kmods/kmod.c - + src/sys/mpi/system.c - + src/sys/lib/kmalloc.c - + src/sys/vmm/paging.c - + src/sys/kernel/ubthread.c - + src/sys/kernel/sched.c - + src/sys/ubixfs/dirCache.c - + src/sys/sys/video.c - + src/sys/sys/device.c - + src/sys/isa/ne2k.c - + src/sys/isa/atkbd.c - + src/sys/vmm/pagefault.c - + src/sys/devfs/devfs.c - + src/sys/kernel/smp.c - + src/sys/vmm/vmm_memory.c - + src/sys/kernel/spinlock.c - + src/sys/vfs/file.c - + src/sys/vmm/getfreepage.c - + src/sys/kernel/syscall_new.c - + src/sys/isa/fdc.c - + src/sys/vmm/getfreevirtualpage.c - + src/sys/vmm/copyvirtualspace.c @@ -244,7 +237,6 @@ spinTryLock adjustCowCounter cpuInfo - current_thread devfs_makeNode devfs_open device_add @@ -266,7 +258,6 @@ ne2kAllocBuffer schedNewTask smpInit - sys_thread_new tty_print ubixfs_cacheAdd ubixfs_cacheFind @@ -368,7 +359,6 @@ adjustCowCounter cpuInfo - current_thread devfs_makeNode devfs_open device_add @@ -391,7 +381,6 @@ ne2kAllocBuffer schedNewTask smpInit - sys_thread_new tty_print ubixfs_cacheAdd ubixfs_cacheFind diff --git a/doc/xml/start_8S.xml b/doc/xml/start_8S.xml index 72340b8..d218bb8 100644 --- a/doc/xml/start_8S.xml +++ b/doc/xml/start_8S.xml @@ -9,7 +9,7 @@ (loadGDT) mov $0x10 lgdtl - loadGDT + loadGDT @@ -354,7 +354,7 @@ stosb /*LoadGDT*/ -lgdtl(loadGDT) +lgdtl(loadGDT) mov$0x10,%eax mov%eax,%ds mov%eax,%es diff --git a/doc/xml/static_8c.xml b/doc/xml/static_8c.xml index 5ffe91c..9958213 100644 --- a/doc/xml/static_8c.xml +++ b/doc/xml/static_8c.xml @@ -4,26 +4,26 @@ static.c lib/kprintf.h - + ubixos/types.h - + - + sys/_types.h - + src/sys/init/static.c - + - + lib/kprintf.h - + diff --git a/doc/xml/static_8h.xml b/doc/xml/static_8h.xml index 79a00dc..3d0523b 100644 --- a/doc/xml/static_8h.xml +++ b/doc/xml/static_8h.xml @@ -2,22 +2,22 @@ static.h - src/sys/include/ubixos/init.h + src/sys/include/ubixos/init.h - + src/sys/init/main.c - + src/sys/include/ubixos/init.h - - + + - + src/sys/include/ubixos/static.h - + diff --git a/doc/xml/stdarg_8h.xml b/doc/xml/stdarg_8h.xml index 42a429f..24754be 100644 --- a/doc/xml/stdarg_8h.xml +++ b/doc/xml/stdarg_8h.xml @@ -6,25 +6,25 @@ src/sys/lib/kprintf.c src/sys/lib/vsprintf.c - + src/sys/lib/kprintf.c - + src/sys/include/stdarg.h - + - + - + - + src/sys/kernel/kpanic.c - + src/sys/lib/vsprintf.c diff --git a/doc/xml/string_8c.xml b/doc/xml/string_8c.xml index 64e6971..281cbc7 100644 --- a/doc/xml/string_8c.xml +++ b/doc/xml/string_8c.xml @@ -4,26 +4,26 @@ string.c lib/string.h - + src/sys/lib/string.c - + - + ubixos/types.h - + - + sys/_types.h - + lib/string.h - + @@ -123,6 +123,7 @@ + strstr void @@ -169,7 +170,7 @@ - NULL + NULL strlen strncmp fopen @@ -308,7 +309,7 @@ do{ do{ if((sc=*s++)==0) -return(NULL); +return(NULL); }while(sc!=c); }while(strncmp(s,find,len)!=0); s--; @@ -319,46 +320,49 @@ /*** $Log$ -Revision1.22006/12/0514:10:21reddawg -WorkignDistro +Revision1.32006/12/1214:09:18reddawg +Changes -Revision1.1.1.12006/06/0112:46:16reddawg -ubix2 +Revision1.22006/12/0514:10:21reddawg +WorkignDistro -Revision1.22005/10/1200:13:37reddawg -Removed +Revision1.1.1.12006/06/0112:46:16reddawg +ubix2 -Revision1.1.1.12005/09/2617:24:13reddawg -nomessage +Revision1.22005/10/1200:13:37reddawg +Removed -Revision1.62004/07/2815:05:43reddawg -Major: -Pagesnowhavestrictsecurityenforcement. -Manynulldereferenceshavebeenresolved. -Whenappsloadedpermissionssetforpagesrwandro - -Revision1.52004/07/2018:42:41flameshadow -add:strcpy() -chg:modifieddirCache.ctousestrcpy() - -Revision1.42004/07/0523:06:32reddawg -Fixens +Revision1.1.1.12005/09/2617:24:13reddawg +nomessage + +Revision1.62004/07/2815:05:43reddawg +Major: +Pagesnowhavestrictsecurityenforcement. +Manynulldereferenceshavebeenresolved. +Whenappsloadedpermissionssetforpagesrwandro + +Revision1.52004/07/2018:42:41flameshadow +add:strcpy() +chg:modifieddirCache.ctousestrcpy() -Revision1.32004/06/2823:12:58reddawg -fileformatnowcontainer:/path/to/file +Revision1.42004/07/0523:06:32reddawg +Fixens -Revision1.22004/05/1914:40:58reddawg -Cleanedupsomewarningfromleavingouttypedefs +Revision1.32004/06/2823:12:58reddawg +fileformatnowcontainer:/path/to/file -Revision1.1.1.12004/04/1512:07:11reddawg -UbixOSv1.0 +Revision1.22004/05/1914:40:58reddawg +Cleanedupsomewarningfromleavingouttypedefs -Revision1.52004/04/1316:36:33reddawg -Changedourcopyright,itisallnowunderaBSD-Stylelicense +Revision1.1.1.12004/04/1512:07:11reddawg +UbixOSv1.0 -END -***/ - +Revision1.52004/04/1316:36:33reddawg +Changedourcopyright,itisallnowunderaBSD-Stylelicense + +END +***/ + diff --git a/doc/xml/string_8h.xml b/doc/xml/string_8h.xml index 63c7acc..c44acc2 100644 --- a/doc/xml/string_8h.xml +++ b/doc/xml/string_8h.xml @@ -17,158 +17,144 @@ src/sys/lib/bcopy.c src/sys/lib/memset.c src/sys/lib/net.c - src/sys/net/net/bot.c - src/sys/net/net/shell.c src/sys/pci/hd.c src/sys/sys/idt.c src/sys/vmm/copyvirtualspace.c src/sys/vmm/paging.c - + ubixos/types.h - + - + sys/_types.h - + src/sys/include/string.h - + - + src/sys/lib/memcpy.c - + src/sys/pci/hd.c - + src/sys/lib/net.c - + src/sys/kernel/vitals.c - + src/sys/kernel/tty.c - + src/sys/kmods/kmod.c - + src/sys/kernel/kern_sysctl.c - + src/sys/lib/kmalloc.c - + src/sys/vmm/paging.c - + src/sys/kernel/systemtask.c - - src/sys/net/net/bot.c - - - + src/sys/include/string.h - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + - + src/sys/kernel/ld.c - + src/sys/kernel/fork.c - + src/sys/kernel/sched.c - - src/sys/net/net/shell.c - - - + src/sys/lib/memset.c - + src/sys/isa/ne2k.c - + src/sys/lib/bcopy.c - + - + src/sys/sys/idt.c - + src/sys/kernel/gen_calls.c - + src/sys/vmm/copyvirtualspace.c @@ -338,7 +324,7 @@ LONG_MAX LONG_MIN - NULL + NULL inet_aton diff --git a/doc/xml/strtok_8c.xml b/doc/xml/strtok_8c.xml index 0491fa4..5536951 100644 --- a/doc/xml/strtok_8c.xml +++ b/doc/xml/strtok_8c.xml @@ -5,28 +5,28 @@ lib/string.h ubixos/types.h - + src/sys/lib/strtok.c - + - + - + ubixos/types.h - + - + sys/_types.h - + lib/string.h - + @@ -80,7 +80,7 @@ - NULL + NULL strtok @@ -126,8 +126,8 @@ intc,sc; char*tok; -if((s==NULL)&&((s=*last)==NULL)){ -return(NULL); +if((s==NULL)&&((s=*last)==NULL)){ +return(NULL); } cont: @@ -138,8 +138,8 @@ } } if(c==0){ -*last=NULL; -return(NULL); +*last=NULL; +return(NULL); } tok=s-1; @@ -149,7 +149,7 @@ do{ if((sc=*spanp++)==c){ if(c==0){ -s=NULL; +s=NULL; } else{ char*w=s-1; diff --git a/doc/xml/strtol_8c.xml b/doc/xml/strtol_8c.xml index f09609d..eb7695b 100644 --- a/doc/xml/strtol_8c.xml +++ b/doc/xml/strtol_8c.xml @@ -4,26 +4,26 @@ strtol.c sys/cdefs.h - + ubixos/types.h - + - + sys/_types.h - + src/sys/lib/strtol.c - + - + sys/cdefs.h - + @@ -80,7 +80,7 @@ LONG_MAX LONG_MIN - NULL + NULL inet_aton @@ -188,7 +188,7 @@ cutoff=0x0;//UBU }elseif(neg) acc=-acc; -if(endptr!=NULL) +if(endptr!=NULL) *endptr=(char*)(any?s-1:nptr); return(acc); } diff --git a/doc/xml/struct____sigset.xml b/doc/xml/struct____sigset.xml index f544c8f..e09bf3d 100644 --- a/doc/xml/struct____sigset.xml +++ b/doc/xml/struct____sigset.xml @@ -4,10 +4,10 @@ __sigset signal.h - + __uint32_t - __uint32_t __sigset::__bits[_SIG_WORDS] - [_SIG_WORDS] + __uint32_t __sigset::__bits[4] + [4] __bits @@ -24,7 +24,7 @@ - __sigset__bits + __sigset__bits diff --git a/doc/xml/struct__item__t.xml b/doc/xml/struct__item__t.xml index 90d85d8..55c837f 100644 --- a/doc/xml/struct__item__t.xml +++ b/doc/xml/struct__item__t.xml @@ -50,10 +50,10 @@ - + _item_t - + Next Previous diff --git a/doc/xml/struct__list__t.xml b/doc/xml/struct__list__t.xml index ade5552..44e5ae0 100644 --- a/doc/xml/struct__list__t.xml +++ b/doc/xml/struct__list__t.xml @@ -36,18 +36,18 @@ - + _list_t - + Last First - + _item_t - + Next Previous diff --git a/doc/xml/structbsd__disklabel.xml b/doc/xml/structbsd__disklabel.xml index 75ea078..1f8ca0a 100644 --- a/doc/xml/structbsd__disklabel.xml +++ b/doc/xml/structbsd__disklabel.xml @@ -57,10 +57,10 @@ - + u_int32_t - u_int32_t bsd_disklabel::d_drivedata[NDDATA] - [NDDATA] + u_int32_t bsd_disklabel::d_drivedata[5] + [5] d_drivedata @@ -201,10 +201,10 @@ - + bsd_disklabel::partition - struct bsd_disklabel::partition bsd_disklabel::d_partitions[MAXPARTITIONS] - [MAXPARTITIONS] + struct bsd_disklabel::partition bsd_disklabel::d_partitions[ 8 ] + [8] d_partitions @@ -280,10 +280,10 @@ - + u_int32_t - u_int32_t bsd_disklabel::d_spare[NSPARE] - [NSPARE] + u_int32_t bsd_disklabel::d_spare[5] + [5] d_spare @@ -390,14 +390,14 @@ - + bsd_disklabel - + d_partitions - + bsd_disklabel::partition @@ -408,7 +408,7 @@ bsd_disklabeld_bbsize bsd_disklabeld_checksum bsd_disklabeld_cylskew - bsd_disklabeld_drivedata + bsd_disklabeld_drivedata bsd_disklabeld_flags bsd_disklabeld_headswitch bsd_disklabeld_interleave @@ -419,13 +419,13 @@ bsd_disklabeld_nsectors bsd_disklabeld_ntracks bsd_disklabeld_packname - bsd_disklabeld_partitions + bsd_disklabeld_partitions bsd_disklabeld_rpm bsd_disklabeld_sbsize bsd_disklabeld_secpercyl bsd_disklabeld_secperunit bsd_disklabeld_secsize - bsd_disklabeld_spare + bsd_disklabeld_spare bsd_disklabeld_sparespercyl bsd_disklabeld_sparespertrack bsd_disklabeld_subtype diff --git a/doc/xml/structcacheNode.xml b/doc/xml/structcacheNode.xml index 177f380..9cb650b 100644 --- a/doc/xml/structcacheNode.xml +++ b/doc/xml/structcacheNode.xml @@ -226,10 +226,10 @@ - + cacheNode - + prev next parent diff --git a/doc/xml/structclose__args.xml b/doc/xml/structclose__args.xml index ac541e0..3daf285 100644 --- a/doc/xml/structclose__args.xml +++ b/doc/xml/structclose__args.xml @@ -18,10 +18,10 @@ close - + char - char close_args::fd_l_[PADL_(int)] - [PADL_(int)] + char close_args::fd_l_[0] + [0] fd_l_ @@ -31,10 +31,10 @@ - + char - char close_args::fd_r_[PADR_(int)] - [PADR_(int)] + char close_args::fd_r_[(sizeof(register_t)<=sizeof(int)?0:sizeof(register_t)-sizeof(int))] + [(sizeof(register_t)<=sizeof(int)?0:sizeof(register_t)-sizeof(int))] fd_r_ @@ -52,8 +52,8 @@ close_argsfd - close_argsfd_l_ - close_argsfd_r_ + close_argsfd_l_ + close_argsfd_r_ diff --git a/doc/xml/structconfadd.xml b/doc/xml/structconfadd.xml index 9f5d51a..dff2dc0 100644 --- a/doc/xml/structconfadd.xml +++ b/doc/xml/structconfadd.xml @@ -32,6 +32,7 @@ + pci_init uInt8 diff --git a/doc/xml/structdevfs__devices.xml b/doc/xml/structdevfs__devices.xml index 1bebd89..eb4d110 100644 --- a/doc/xml/structdevfs__devices.xml +++ b/doc/xml/structdevfs__devices.xml @@ -102,10 +102,10 @@ - + devfs_devices - + prev next diff --git a/doc/xml/structdevfs__info.xml b/doc/xml/structdevfs__info.xml index 017853d..bc6d51d 100644 --- a/doc/xml/structdevfs__info.xml +++ b/doc/xml/structdevfs__info.xml @@ -26,18 +26,18 @@ - + devfs_devices - + prev next - + devfs_info - + deviceList diff --git a/doc/xml/structdevice.xml b/doc/xml/structdevice.xml index ccf907f..c6ea55d 100644 --- a/doc/xml/structdevice.xml +++ b/doc/xml/structdevice.xml @@ -18,8 +18,6 @@ dp_recv getblock - low_level_init - low_level_output ne2k_init ne2kHandler NICtoPC @@ -37,8 +35,6 @@ - low_level_init - low_level_output ne2k_init @@ -86,21 +82,21 @@ - + ei_device - + net - + device - + priv - + net diff --git a/doc/xml/structdevice__interface.xml b/doc/xml/structdevice__interface.xml index 5daebbf..facfd54 100644 --- a/doc/xml/structdevice__interface.xml +++ b/doc/xml/structdevice__interface.xml @@ -19,6 +19,7 @@ devfs_read devfs_write dskread + hdInit initHardDisk syncBat ubixfs_initialize @@ -56,6 +57,7 @@ device_add + hdInit void(* @@ -138,6 +140,8 @@ devfs_open + fdcInit2 + hdInit void(* diff --git a/doc/xml/structdevice__node.xml b/doc/xml/structdevice__node.xml index 5e22c58..9629657 100644 --- a/doc/xml/structdevice__node.xml +++ b/doc/xml/structdevice__node.xml @@ -22,6 +22,8 @@ device_add device_find dskread + fdcInit2 + hdInit openFileUbixFS syncBat ubixfs_initialize @@ -108,25 +110,25 @@ - + device_resource - + device_node - + devRec - + devInfo - + prev next - + device_interface diff --git a/doc/xml/structdirectoryList.xml b/doc/xml/structdirectoryList.xml index d96eed8..38b9521 100644 --- a/doc/xml/structdirectoryList.xml +++ b/doc/xml/structdirectoryList.xml @@ -79,10 +79,10 @@ - + directoryList - + prev next diff --git a/doc/xml/structdirent.xml b/doc/xml/structdirent.xml index 950bf4a..d2e06c4 100644 --- a/doc/xml/structdirent.xml +++ b/doc/xml/structdirent.xml @@ -18,10 +18,10 @@ fsfind - + char - char dirent::d_name[MAXNAMLEN+1] - [MAXNAMLEN+1] + char dirent::d_name[255+1] + [255+1] d_name @@ -81,7 +81,7 @@ direntd_fileno - direntd_name + direntd_name direntd_namlen direntd_reclen direntd_type diff --git a/doc/xml/structdmadat.xml b/doc/xml/structdmadat.xml index c6a8b3e..ca5f5a4 100644 --- a/doc/xml/structdmadat.xml +++ b/doc/xml/structdmadat.xml @@ -4,10 +4,10 @@ dmadat file.h - + char - char dmadat::blkbuf[VBLKSIZE] - [VBLKSIZE] + char dmadat::blkbuf[(1<< 12)] + [(1<< 12)] blkbuf @@ -18,10 +18,10 @@ fsread - + char - char dmadat::indbuf[VBLKSIZE] - [VBLKSIZE] + char dmadat::indbuf[(1<< 12)] + [(1<< 12)] indbuf @@ -32,10 +32,10 @@ fsread - + char - char dmadat::sbbuf[SBLOCKSIZE] - [SBLOCKSIZE] + char dmadat::sbbuf[8192] + [8192] sbbuf @@ -47,10 +47,10 @@ ffs_read fsread - + char - char dmadat::secbuf[DEV_BSIZE] - [DEV_BSIZE] + char dmadat::secbuf[(1<< 9)] + [(1<< 9)] secbuf @@ -67,10 +67,10 @@ - dmadatblkbuf - dmadatindbuf - dmadatsbbuf - dmadatsecbuf + dmadatblkbuf + dmadatindbuf + dmadatsbbuf + dmadatsecbuf diff --git a/doc/xml/structdriverType.xml b/doc/xml/structdriverType.xml index de756d1..1a2c0e9 100644 --- a/doc/xml/structdriverType.xml +++ b/doc/xml/structdriverType.xml @@ -36,14 +36,14 @@ - + devMethodType - + driverType - + methods diff --git a/doc/xml/structfcntl__args.xml b/doc/xml/structfcntl__args.xml index 40f19c9..c007979 100644 --- a/doc/xml/structfcntl__args.xml +++ b/doc/xml/structfcntl__args.xml @@ -18,10 +18,10 @@ fcntl - + char - char fcntl_args::arg_l_[PADL_(long)] - [PADL_(long)] + char fcntl_args::arg_l_[0] + [0] arg_l_ @@ -31,10 +31,10 @@ - + char - char fcntl_args::arg_r_[PADR_(long)] - [PADR_(long)] + char fcntl_args::arg_r_[(sizeof(register_t)<=sizeof(long)?0:sizeof(register_t)-sizeof(long))] + [(sizeof(register_t)<=sizeof(long)?0:sizeof(register_t)-sizeof(long))] arg_r_ @@ -58,10 +58,10 @@ fcntl - + char - char fcntl_args::cmd_l_[PADL_(int)] - [PADL_(int)] + char fcntl_args::cmd_l_[0] + [0] cmd_l_ @@ -71,10 +71,10 @@ - + char - char fcntl_args::cmd_r_[PADR_(int)] - [PADR_(int)] + char fcntl_args::cmd_r_[(sizeof(register_t)<=sizeof(int)?0:sizeof(register_t)-sizeof(int))] + [(sizeof(register_t)<=sizeof(int)?0:sizeof(register_t)-sizeof(int))] cmd_r_ @@ -98,10 +98,10 @@ fcntl - + char - char fcntl_args::fd_l_[PADL_(int)] - [PADL_(int)] + char fcntl_args::fd_l_[0] + [0] fd_l_ @@ -111,10 +111,10 @@ - + char - char fcntl_args::fd_r_[PADR_(int)] - [PADR_(int)] + char fcntl_args::fd_r_[(sizeof(register_t)<=sizeof(int)?0:sizeof(register_t)-sizeof(int))] + [(sizeof(register_t)<=sizeof(int)?0:sizeof(register_t)-sizeof(int))] fd_r_ @@ -132,14 +132,14 @@ fcntl_argsarg - fcntl_argsarg_l_ - fcntl_argsarg_r_ + fcntl_argsarg_l_ + fcntl_argsarg_r_ fcntl_argscmd - fcntl_argscmd_l_ - fcntl_argscmd_r_ + fcntl_argscmd_l_ + fcntl_argscmd_r_ fcntl_argsfd - fcntl_argsfd_l_ - fcntl_argsfd_r_ + fcntl_argsfd_l_ + fcntl_argsfd_r_ diff --git a/doc/xml/structfile.xml b/doc/xml/structfile.xml index 41e5e2e..e6b607d 100644 --- a/doc/xml/structfile.xml +++ b/doc/xml/structfile.xml @@ -56,28 +56,28 @@ - + device_resource - + device_node - + devRec - + devInfo - + prev next - + cacheNode - + prev next parent @@ -85,70 +85,70 @@ fileListHead - + ubixDiskLabel - + partitions - + ubixDiskLabel::ubixPartitions - + fileDescriptorStruct - + cacheNode - + dmadat - + mp - + prev next - + file - + fd - + vfs_mountPoint - + diskLabel - + device - + fs - + prev next - + device_interface - + dmadat - + fileSystem - + prev next diff --git a/doc/xml/structfileDescriptorStruct.xml b/doc/xml/structfileDescriptorStruct.xml index 3810a63..8a89cea 100644 --- a/doc/xml/structfileDescriptorStruct.xml +++ b/doc/xml/structfileDescriptorStruct.xml @@ -301,28 +301,28 @@ - + device_resource - + device_node - + devRec - + devInfo - + prev next - + cacheNode - + prev next parent @@ -330,63 +330,63 @@ fileListHead - + ubixDiskLabel - + partitions - + ubixDiskLabel::ubixPartitions - + fileDescriptorStruct - + cacheNode - + dmadat - + mp - + prev next - + vfs_mountPoint - + diskLabel - + device - + fs - + prev next - + device_interface - + dmadat - + fileSystem - + prev next diff --git a/doc/xml/structfileSystem.xml b/doc/xml/structfileSystem.xml index 3864132..003f35c 100644 --- a/doc/xml/structfileSystem.xml +++ b/doc/xml/structfileSystem.xml @@ -166,10 +166,10 @@ not sure if we should allow function to point to NULL - + fileSystem - + prev next diff --git a/doc/xml/structfs.xml b/doc/xml/structfs.xml index 73b846b..5e4e306 100644 --- a/doc/xml/structfs.xml +++ b/doc/xml/structfs.xml @@ -368,10 +368,10 @@ - + u_char - u_char fs::fs_fsmnt[MAXMNTLEN] - [MAXMNTLEN] + u_char fs::fs_fsmnt[468] + [468] fs_fsmnt @@ -565,10 +565,10 @@ - + void * - void* fs::fs_ocsp[NOCSPTRS] - [NOCSPTRS] + void* fs::fs_ocsp[((128/sizeof(void *))-4)] + [((128/sizeof(void *))-4)] fs_ocsp @@ -1020,10 +1020,10 @@ - + int32_t - int32_t fs::fs_snapinum[FSMAXSNAP] - [FSMAXSNAP] + int32_t fs::fs_snapinum[20] + [20] fs_snapinum @@ -1150,10 +1150,10 @@ - + u_char - u_char fs::fs_volname[MAXVOLLEN] - [MAXVOLLEN] + u_char fs::fs_volname[32] + [32] fs_volname @@ -1169,22 +1169,22 @@ - + csum - + csum_total - + fs - + fs_old_cstotal fs_csp - + fs_cstotal @@ -1219,7 +1219,7 @@ fsfs_fsbtodb fsfs_fshift fsfs_fsize - fsfs_fsmnt + fsfs_fsmnt fsfs_iblkno fsfs_id fsfs_inopb @@ -1234,7 +1234,7 @@ fsfs_minfree fsfs_ncg fsfs_nindir - fsfs_ocsp + fsfs_ocsp fsfs_old_cgmask fsfs_old_cgoffset fsfs_old_cpc @@ -1269,7 +1269,7 @@ fsfs_sblockloc fsfs_sbsize fsfs_size - fsfs_snapinum + fsfs_snapinum fsfs_spare1 fsfs_spare2 fsfs_spare5 @@ -1279,7 +1279,7 @@ fsfs_swuid fsfs_time fsfs_unused_1 - fsfs_volname + fsfs_volname diff --git a/doc/xml/structfstat__args.xml b/doc/xml/structfstat__args.xml index c83daf6..94964b0 100644 --- a/doc/xml/structfstat__args.xml +++ b/doc/xml/structfstat__args.xml @@ -18,10 +18,10 @@ fstat - + char - char fstat_args::fd_l_[PADL_(int)] - [PADL_(int)] + char fstat_args::fd_l_[0] + [0] fd_l_ @@ -31,10 +31,10 @@ - + char - char fstat_args::fd_r_[PADR_(int)] - [PADR_(int)] + char fstat_args::fd_r_[(sizeof(register_t)<=sizeof(int)?0:sizeof(register_t)-sizeof(int))] + [(sizeof(register_t)<=sizeof(int)?0:sizeof(register_t)-sizeof(int))] fd_r_ @@ -58,10 +58,10 @@ fstat - + char - char fstat_args::sb_l_[PADL_(struct stat *)] - [PADL_(struct stat *)] + char fstat_args::sb_l_[0] + [0] sb_l_ @@ -71,10 +71,10 @@ - + char - char fstat_args::sb_r_[PADR_(struct stat *)] - [PADR_(struct stat *)] + char fstat_args::sb_r_[(sizeof(register_t)<=sizeof(struct stat *)?0:sizeof(register_t)-sizeof(struct stat *))] + [(sizeof(register_t)<=sizeof(struct stat *)?0:sizeof(register_t)-sizeof(struct stat *))] sb_r_ @@ -90,14 +90,14 @@ - + fstat_args - + sb - + stat @@ -105,11 +105,11 @@ fstat_argsfd - fstat_argsfd_l_ - fstat_argsfd_r_ + fstat_argsfd_l_ + fstat_argsfd_r_ fstat_argssb - fstat_argssb_l_ - fstat_argssb_r_ + fstat_argssb_l_ + fstat_argssb_r_ diff --git a/doc/xml/structgettimeofday__args.xml b/doc/xml/structgettimeofday__args.xml index 85bcd04..9918acc 100644 --- a/doc/xml/structgettimeofday__args.xml +++ b/doc/xml/structgettimeofday__args.xml @@ -17,10 +17,10 @@ - + char - char gettimeofday_args::tp_l_[PADL_(struct timeval *)] - [PADL_(struct timeval *)] + char gettimeofday_args::tp_l_[0] + [0] tp_l_ @@ -30,10 +30,10 @@ - + char - char gettimeofday_args::tp_r_[PADR_(struct timeval *)] - [PADR_(struct timeval *)] + char gettimeofday_args::tp_r_[(sizeof(register_t)<=sizeof(struct timeval *)?0:sizeof(register_t)-sizeof(struct timeval *))] + [(sizeof(register_t)<=sizeof(struct timeval *)?0:sizeof(register_t)-sizeof(struct timeval *))] tp_r_ @@ -56,10 +56,10 @@ - + char - char gettimeofday_args::tzp_l_[PADL_(struct timezone *)] - [PADL_(struct timezone *)] + char gettimeofday_args::tzp_l_[0] + [0] tzp_l_ @@ -69,10 +69,10 @@ - + char - char gettimeofday_args::tzp_r_[PADR_(struct timezone *)] - [PADR_(struct timezone *)] + char gettimeofday_args::tzp_r_[(sizeof(register_t)<=sizeof(struct timezone *)?0:sizeof(register_t)-sizeof(struct timezone *))] + [(sizeof(register_t)<=sizeof(struct timezone *)?0:sizeof(register_t)-sizeof(struct timezone *))] tzp_r_ @@ -88,21 +88,21 @@ - + timezone - + gettimeofday_args - + tzp - + tp - + timeval @@ -110,11 +110,11 @@ gettimeofday_argstp - gettimeofday_argstp_l_ - gettimeofday_argstp_r_ + gettimeofday_argstp_l_ + gettimeofday_argstp_r_ gettimeofday_argstzp - gettimeofday_argstzp_l_ - gettimeofday_argstzp_r_ + gettimeofday_argstzp_l_ + gettimeofday_argstzp_r_ diff --git a/doc/xml/structhostRingEntry.xml b/doc/xml/structhostRingEntry.xml index 1d18d2f..872fe19 100644 --- a/doc/xml/structhostRingEntry.xml +++ b/doc/xml/structhostRingEntry.xml @@ -4,9 +4,9 @@ hostRingEntry lnc.h - - hostRingEntry::@6 - union hostRingEntry::@6 hostRingEntry::buff + + hostRingEntry::@0 + union hostRingEntry::@0 hostRingEntry::buff buff @@ -49,21 +49,21 @@ - + mds - + hostRingEntry - + md - hostRingEntrybuff + hostRingEntrybuff hostRingEntrydata hostRingEntrymd diff --git a/doc/xml/structioctl__args.xml b/doc/xml/structioctl__args.xml index 3c779f4..8d7c31e 100644 --- a/doc/xml/structioctl__args.xml +++ b/doc/xml/structioctl__args.xml @@ -17,10 +17,10 @@ - + char - char ioctl_args::com_l_[PADL_(u_long)] - [PADL_(u_long)] + char ioctl_args::com_l_[0] + [0] com_l_ @@ -30,10 +30,10 @@ - + char - char ioctl_args::com_r_[PADR_(u_long)] - [PADR_(u_long)] + char ioctl_args::com_r_[(sizeof(register_t)<=sizeof(u_long)?0:sizeof(register_t)-sizeof(u_long))] + [(sizeof(register_t)<=sizeof(u_long)?0:sizeof(register_t)-sizeof(u_long))] com_r_ @@ -56,10 +56,10 @@ - + char - char ioctl_args::data_l_[PADL_(caddr_t)] - [PADL_(caddr_t)] + char ioctl_args::data_l_[0] + [0] data_l_ @@ -69,10 +69,10 @@ - + char - char ioctl_args::data_r_[PADR_(caddr_t)] - [PADR_(caddr_t)] + char ioctl_args::data_r_[(sizeof(register_t)<=sizeof(caddr_t)?0:sizeof(register_t)-sizeof(caddr_t))] + [(sizeof(register_t)<=sizeof(caddr_t)?0:sizeof(register_t)-sizeof(caddr_t))] data_r_ @@ -95,10 +95,10 @@ - + char - char ioctl_args::fd_l_[PADL_(int)] - [PADL_(int)] + char ioctl_args::fd_l_[0] + [0] fd_l_ @@ -108,10 +108,10 @@ - + char - char ioctl_args::fd_r_[PADR_(int)] - [PADR_(int)] + char ioctl_args::fd_r_[(sizeof(register_t)<=sizeof(int)?0:sizeof(register_t)-sizeof(int))] + [(sizeof(register_t)<=sizeof(int)?0:sizeof(register_t)-sizeof(int))] fd_r_ @@ -129,14 +129,14 @@ ioctl_argscom - ioctl_argscom_l_ - ioctl_argscom_r_ + ioctl_argscom_l_ + ioctl_argscom_r_ ioctl_argsdata - ioctl_argsdata_l_ - ioctl_argsdata_r_ + ioctl_argsdata_l_ + ioctl_argsdata_r_ ioctl_argsfd - ioctl_argsfd_l_ - ioctl_argsfd_r_ + ioctl_argsfd_l_ + ioctl_argsfd_r_ diff --git a/doc/xml/structkmod__struct.xml b/doc/xml/structkmod__struct.xml index ab29887..9195787 100644 --- a/doc/xml/structkmod__struct.xml +++ b/doc/xml/structkmod__struct.xml @@ -88,10 +88,10 @@ - + kmod_struct - + prev next diff --git a/doc/xml/structlncInfo.xml b/doc/xml/structlncInfo.xml index f3207cf..9ffa746 100644 --- a/doc/xml/structlncInfo.xml +++ b/doc/xml/structlncInfo.xml @@ -162,43 +162,43 @@ - + initBlock - + mds - + lncInfo - + arpcom - + nic - + recvRing transRings - + initBloack - + nicInfo - + hostRingEntry - + md - + arpcom diff --git a/doc/xml/structmemDescriptor.xml b/doc/xml/structmemDescriptor.xml index f48f777..95fd259 100644 --- a/doc/xml/structmemDescriptor.xml +++ b/doc/xml/structmemDescriptor.xml @@ -79,10 +79,10 @@ - + memDescriptor - + prev next diff --git a/doc/xml/structmmap__args.xml b/doc/xml/structmmap__args.xml index 7a66669..8dd74ad 100644 --- a/doc/xml/structmmap__args.xml +++ b/doc/xml/structmmap__args.xml @@ -18,10 +18,10 @@ mmap - + char - char mmap_args::addr_l_[PADL_(caddr_t)] - [PADL_(caddr_t)] + char mmap_args::addr_l_[0] + [0] addr_l_ @@ -31,10 +31,10 @@ - + char - char mmap_args::addr_r_[PADR_(caddr_t)] - [PADR_(caddr_t)] + char mmap_args::addr_r_[(sizeof(register_t)<=sizeof(caddr_t)?0:sizeof(register_t)-sizeof(caddr_t))] + [(sizeof(register_t)<=sizeof(caddr_t)?0:sizeof(register_t)-sizeof(caddr_t))] addr_r_ @@ -58,10 +58,10 @@ mmap - + char - char mmap_args::fd_l_[PADL_(int)] - [PADL_(int)] + char mmap_args::fd_l_[0] + [0] fd_l_ @@ -71,10 +71,10 @@ - + char - char mmap_args::fd_r_[PADR_(int)] - [PADR_(int)] + char mmap_args::fd_r_[(sizeof(register_t)<=sizeof(int)?0:sizeof(register_t)-sizeof(int))] + [(sizeof(register_t)<=sizeof(int)?0:sizeof(register_t)-sizeof(int))] fd_r_ @@ -98,10 +98,10 @@ mmap - + char - char mmap_args::flags_l_[PADL_(int)] - [PADL_(int)] + char mmap_args::flags_l_[0] + [0] flags_l_ @@ -111,10 +111,10 @@ - + char - char mmap_args::flags_r_[PADR_(int)] - [PADR_(int)] + char mmap_args::flags_r_[(sizeof(register_t)<=sizeof(int)?0:sizeof(register_t)-sizeof(int))] + [(sizeof(register_t)<=sizeof(int)?0:sizeof(register_t)-sizeof(int))] flags_r_ @@ -138,10 +138,10 @@ mmap - + char - char mmap_args::len_l_[PADL_(size_t)] - [PADL_(size_t)] + char mmap_args::len_l_[0] + [0] len_l_ @@ -151,10 +151,10 @@ - + char - char mmap_args::len_r_[PADR_(size_t)] - [PADR_(size_t)] + char mmap_args::len_r_[(sizeof(register_t)<=sizeof(size_t)?0:sizeof(register_t)-sizeof(size_t))] + [(sizeof(register_t)<=sizeof(size_t)?0:sizeof(register_t)-sizeof(size_t))] len_r_ @@ -178,10 +178,10 @@ mmap - + char - char mmap_args::pad_l_[PADL_(int)] - [PADL_(int)] + char mmap_args::pad_l_[0] + [0] pad_l_ @@ -191,10 +191,10 @@ - + char - char mmap_args::pad_r_[PADR_(int)] - [PADR_(int)] + char mmap_args::pad_r_[(sizeof(register_t)<=sizeof(int)?0:sizeof(register_t)-sizeof(int))] + [(sizeof(register_t)<=sizeof(int)?0:sizeof(register_t)-sizeof(int))] pad_r_ @@ -218,10 +218,10 @@ mmap - + char - char mmap_args::pos_l_[PADL_(off_t)] - [PADL_(off_t)] + char mmap_args::pos_l_[0] + [0] pos_l_ @@ -231,10 +231,10 @@ - + char - char mmap_args::pos_r_[PADR_(off_t)] - [PADR_(off_t)] + char mmap_args::pos_r_[(sizeof(register_t)<=sizeof(off_t)?0:sizeof(register_t)-sizeof(off_t))] + [(sizeof(register_t)<=sizeof(off_t)?0:sizeof(register_t)-sizeof(off_t))] pos_r_ @@ -258,10 +258,10 @@ mmap - + char - char mmap_args::prot_l_[PADL_(int)] - [PADL_(int)] + char mmap_args::prot_l_[0] + [0] prot_l_ @@ -271,10 +271,10 @@ - + char - char mmap_args::prot_r_[PADR_(int)] - [PADR_(int)] + char mmap_args::prot_r_[(sizeof(register_t)<=sizeof(int)?0:sizeof(register_t)-sizeof(int))] + [(sizeof(register_t)<=sizeof(int)?0:sizeof(register_t)-sizeof(int))] prot_r_ @@ -292,26 +292,26 @@ mmap_argsaddr - mmap_argsaddr_l_ - mmap_argsaddr_r_ + mmap_argsaddr_l_ + mmap_argsaddr_r_ mmap_argsfd - mmap_argsfd_l_ - mmap_argsfd_r_ + mmap_argsfd_l_ + mmap_argsfd_r_ mmap_argsflags - mmap_argsflags_l_ - mmap_argsflags_r_ + mmap_argsflags_l_ + mmap_argsflags_r_ mmap_argslen - mmap_argslen_l_ - mmap_argslen_r_ + mmap_argslen_l_ + mmap_argslen_r_ mmap_argspad - mmap_argspad_l_ - mmap_argspad_r_ + mmap_argspad_l_ + mmap_argspad_r_ mmap_argspos - mmap_argspos_l_ - mmap_argspos_r_ + mmap_argspos_l_ + mmap_argspos_r_ mmap_argsprot - mmap_argsprot_l_ - mmap_argsprot_r_ + mmap_argsprot_l_ + mmap_argsprot_r_ diff --git a/doc/xml/structmpi__mbox.xml b/doc/xml/structmpi__mbox.xml index 0e65f6f..aad4559 100644 --- a/doc/xml/structmpi__mbox.xml +++ b/doc/xml/structmpi__mbox.xml @@ -16,6 +16,9 @@ + mpi_fetchMessage + mpi_postMessage + mpi_spam mpi_message * @@ -29,6 +32,8 @@ + mpi_postMessage + mpi_spam char @@ -42,6 +47,9 @@ + mpi_createMbox + mpi_destroyMbox + mpi_findMbox mpi_mbox * @@ -55,6 +63,10 @@ + mpi_createMbox + mpi_destroyMbox + mpi_findMbox + mpi_spam pidType @@ -68,6 +80,9 @@ + mpi_createMbox + mpi_destroyMbox + mpi_fetchMessage mpi_mbox * @@ -82,6 +97,7 @@ mpi_createMbox + mpi_destroyMbox @@ -89,21 +105,21 @@ - + mpi_message - + next - + mpi_mbox - + msgLast msg - + prev next diff --git a/doc/xml/structmpi__message.xml b/doc/xml/structmpi__message.xml index 1d62e56..8c1aa38 100644 --- a/doc/xml/structmpi__message.xml +++ b/doc/xml/structmpi__message.xml @@ -4,10 +4,10 @@ mpi_message mpi.h - + char - char mpi_message::data[MESSAGE_LENGTH] - [MESSAGE_LENGTH] + char mpi_message::data[248] + [248] data @@ -51,6 +51,7 @@ + mpi_fetchMessage mpi_postMessage mpi_spam @@ -76,17 +77,17 @@ - + mpi_message - + next - mpi_messagedata + mpi_messagedata mpi_messageheader mpi_messagenext mpi_messagepid diff --git a/doc/xml/structmunmap__args.xml b/doc/xml/structmunmap__args.xml index e2f09e2..bb009f3 100644 --- a/doc/xml/structmunmap__args.xml +++ b/doc/xml/structmunmap__args.xml @@ -17,10 +17,10 @@ - + char - char munmap_args::addr_l_[PADL_(void *)] - [PADL_(void *)] + char munmap_args::addr_l_[0] + [0] addr_l_ @@ -30,10 +30,10 @@ - + char - char munmap_args::addr_r_[PADR_(void *)] - [PADR_(void *)] + char munmap_args::addr_r_[(sizeof(register_t)<=sizeof(void *)?0:sizeof(register_t)-sizeof(void *))] + [(sizeof(register_t)<=sizeof(void *)?0:sizeof(register_t)-sizeof(void *))] addr_r_ @@ -56,10 +56,10 @@ - + char - char munmap_args::len_l_[PADL_(size_t)] - [PADL_(size_t)] + char munmap_args::len_l_[0] + [0] len_l_ @@ -69,10 +69,10 @@ - + char - char munmap_args::len_r_[PADR_(size_t)] - [PADR_(size_t)] + char munmap_args::len_r_[(sizeof(register_t)<=sizeof(size_t)?0:sizeof(register_t)-sizeof(size_t))] + [(sizeof(register_t)<=sizeof(size_t)?0:sizeof(register_t)-sizeof(size_t))] len_r_ @@ -90,11 +90,11 @@ munmap_argsaddr - munmap_argsaddr_l_ - munmap_argsaddr_r_ + munmap_argsaddr_l_ + munmap_argsaddr_r_ munmap_argslen - munmap_argslen_l_ - munmap_argslen_r_ + munmap_argslen_l_ + munmap_argslen_r_ diff --git a/doc/xml/structnicBuffer.xml b/doc/xml/structnicBuffer.xml index 3f675b5..38fad62 100644 --- a/doc/xml/structnicBuffer.xml +++ b/doc/xml/structnicBuffer.xml @@ -17,7 +17,6 @@ dp_pkt2user - low_level_input ne2kAllocBuffer ne2kFreeBuffer @@ -33,8 +32,6 @@ - ethernetif_thread - low_level_input ne2kAllocBuffer @@ -58,10 +55,10 @@ - + nicBuffer - + next diff --git a/doc/xml/structobreak__args.xml b/doc/xml/structobreak__args.xml index 49ed904..37faab2 100644 --- a/doc/xml/structobreak__args.xml +++ b/doc/xml/structobreak__args.xml @@ -18,10 +18,10 @@ obreak - + char - char obreak_args::nsize_l_[PADL_(char *)] - [PADL_(char *)] + char obreak_args::nsize_l_[0] + [0] nsize_l_ @@ -31,10 +31,10 @@ - + char - char obreak_args::nsize_r_[PADR_(char *)] - [PADR_(char *)] + char obreak_args::nsize_r_[(sizeof(register_t)<=sizeof(char *)?0:sizeof(register_t)-sizeof(char *))] + [(sizeof(register_t)<=sizeof(char *)?0:sizeof(register_t)-sizeof(char *))] nsize_r_ @@ -52,8 +52,8 @@ obreak_argsnsize - obreak_argsnsize_l_ - obreak_argsnsize_r_ + obreak_argsnsize_l_ + obreak_argsnsize_r_ diff --git a/doc/xml/structreadlink__args.xml b/doc/xml/structreadlink__args.xml index 728bbf7..1942ef6 100644 --- a/doc/xml/structreadlink__args.xml +++ b/doc/xml/structreadlink__args.xml @@ -17,10 +17,10 @@ - + char - char readlink_args::buf_l_[PADL_(char *)] - [PADL_(char *)] + char readlink_args::buf_l_[0] + [0] buf_l_ @@ -30,10 +30,10 @@ - + char - char readlink_args::buf_r_[PADR_(char *)] - [PADR_(char *)] + char readlink_args::buf_r_[(sizeof(register_t)<=sizeof(char *)?0:sizeof(register_t)-sizeof(char *))] + [(sizeof(register_t)<=sizeof(char *)?0:sizeof(register_t)-sizeof(char *))] buf_r_ @@ -57,10 +57,10 @@ readlink - + char - char readlink_args::count_l_[PADL_(int)] - [PADL_(int)] + char readlink_args::count_l_[0] + [0] count_l_ @@ -70,10 +70,10 @@ - + char - char readlink_args::count_r_[PADR_(int)] - [PADR_(int)] + char readlink_args::count_r_[(sizeof(register_t)<=sizeof(int)?0:sizeof(register_t)-sizeof(int))] + [(sizeof(register_t)<=sizeof(int)?0:sizeof(register_t)-sizeof(int))] count_r_ @@ -97,10 +97,10 @@ readlink - + char - char readlink_args::path_l_[PADL_(char *)] - [PADL_(char *)] + char readlink_args::path_l_[0] + [0] path_l_ @@ -110,10 +110,10 @@ - + char - char readlink_args::path_r_[PADR_(char *)] - [PADR_(char *)] + char readlink_args::path_r_[(sizeof(register_t)<=sizeof(char *)?0:sizeof(register_t)-sizeof(char *))] + [(sizeof(register_t)<=sizeof(char *)?0:sizeof(register_t)-sizeof(char *))] path_r_ @@ -131,14 +131,14 @@ readlink_argsbuf - readlink_argsbuf_l_ - readlink_argsbuf_r_ + readlink_argsbuf_l_ + readlink_argsbuf_r_ readlink_argscount - readlink_argscount_l_ - readlink_argscount_r_ + readlink_argscount_l_ + readlink_argscount_r_ readlink_argspath - readlink_argspath_l_ - readlink_argspath_r_ + readlink_argspath_l_ + readlink_argspath_r_ diff --git a/doc/xml/structsdeWindows.xml b/doc/xml/structsdeWindows.xml index 4ed7b06..738d666 100644 --- a/doc/xml/structsdeWindows.xml +++ b/doc/xml/structsdeWindows.xml @@ -75,10 +75,10 @@ - + sdeWindows - + prev next diff --git a/doc/xml/structsigaction__args.xml b/doc/xml/structsigaction__args.xml index 18c618d..cf14911 100644 --- a/doc/xml/structsigaction__args.xml +++ b/doc/xml/structsigaction__args.xml @@ -17,10 +17,10 @@ - + char - char sigaction_args::act_l_[PADL_(const struct sigaction *)] - [PADL_(const struct sigaction *)] + char sigaction_args::act_l_[0] + [0] act_l_ @@ -30,10 +30,10 @@ - + char - char sigaction_args::act_r_[PADR_(const struct sigaction *)] - [PADR_(const struct sigaction *)] + char sigaction_args::act_r_[(sizeof(register_t)<=sizeof(const struct sigaction *)?0:sizeof(register_t)-sizeof(const struct sigaction *))] + [(sizeof(register_t)<=sizeof(const struct sigaction *)?0:sizeof(register_t)-sizeof(const struct sigaction *))] act_r_ @@ -56,10 +56,10 @@ - + char - char sigaction_args::oact_l_[PADL_(struct sigaction *)] - [PADL_(struct sigaction *)] + char sigaction_args::oact_l_[0] + [0] oact_l_ @@ -69,10 +69,10 @@ - + char - char sigaction_args::oact_r_[PADR_(struct sigaction *)] - [PADR_(struct sigaction *)] + char sigaction_args::oact_r_[(sizeof(register_t)<=sizeof(struct sigaction *)?0:sizeof(register_t)-sizeof(struct sigaction *))] + [(sizeof(register_t)<=sizeof(struct sigaction *)?0:sizeof(register_t)-sizeof(struct sigaction *))] oact_r_ @@ -95,10 +95,10 @@ - + char - char sigaction_args::sig_l_[PADL_(int)] - [PADL_(int)] + char sigaction_args::sig_l_[0] + [0] sig_l_ @@ -108,10 +108,10 @@ - + char - char sigaction_args::sig_r_[PADR_(int)] - [PADR_(int)] + char sigaction_args::sig_r_[(sizeof(register_t)<=sizeof(int)?0:sizeof(register_t)-sizeof(int))] + [(sizeof(register_t)<=sizeof(int)?0:sizeof(register_t)-sizeof(int))] sig_r_ @@ -129,14 +129,14 @@ sigaction_argsact - sigaction_argsact_l_ - sigaction_argsact_r_ + sigaction_argsact_l_ + sigaction_argsact_r_ sigaction_argsoact - sigaction_argsoact_l_ - sigaction_argsoact_r_ + sigaction_argsoact_l_ + sigaction_argsoact_r_ sigaction_argssig - sigaction_argssig_l_ - sigaction_argssig_r_ + sigaction_argssig_l_ + sigaction_argssig_r_ diff --git a/doc/xml/structsigprocmask__args.xml b/doc/xml/structsigprocmask__args.xml index c8729b7..27e1baf 100644 --- a/doc/xml/structsigprocmask__args.xml +++ b/doc/xml/structsigprocmask__args.xml @@ -17,10 +17,10 @@ - + char - char sigprocmask_args::how_l_[PADL_(int)] - [PADL_(int)] + char sigprocmask_args::how_l_[0] + [0] how_l_ @@ -30,10 +30,10 @@ - + char - char sigprocmask_args::how_r_[PADR_(int)] - [PADR_(int)] + char sigprocmask_args::how_r_[(sizeof(register_t)<=sizeof(int)?0:sizeof(register_t)-sizeof(int))] + [(sizeof(register_t)<=sizeof(int)?0:sizeof(register_t)-sizeof(int))] how_r_ @@ -56,10 +56,10 @@ - + char - char sigprocmask_args::oset_l_[PADL_(sigset_t *)] - [PADL_(sigset_t *)] + char sigprocmask_args::oset_l_[0] + [0] oset_l_ @@ -69,10 +69,10 @@ - + char - char sigprocmask_args::oset_r_[PADR_(sigset_t *)] - [PADR_(sigset_t *)] + char sigprocmask_args::oset_r_[(sizeof(register_t)<=sizeof(sigset_t *)?0:sizeof(register_t)-sizeof(sigset_t *))] + [(sizeof(register_t)<=sizeof(sigset_t *)?0:sizeof(register_t)-sizeof(sigset_t *))] oset_r_ @@ -95,10 +95,10 @@ - + char - char sigprocmask_args::set_l_[PADL_(const sigset_t *)] - [PADL_(const sigset_t *)] + char sigprocmask_args::set_l_[0] + [0] set_l_ @@ -108,10 +108,10 @@ - + char - char sigprocmask_args::set_r_[PADR_(const sigset_t *)] - [PADR_(const sigset_t *)] + char sigprocmask_args::set_r_[(sizeof(register_t)<=sizeof(const sigset_t *)?0:sizeof(register_t)-sizeof(const sigset_t *))] + [(sizeof(register_t)<=sizeof(const sigset_t *)?0:sizeof(register_t)-sizeof(const sigset_t *))] set_r_ @@ -127,15 +127,15 @@ - + sigprocmask_args - + oset set - + __sigset @@ -143,14 +143,14 @@ sigprocmask_argshow - sigprocmask_argshow_l_ - sigprocmask_argshow_r_ + sigprocmask_argshow_l_ + sigprocmask_argshow_r_ sigprocmask_argsoset - sigprocmask_argsoset_l_ - sigprocmask_argsoset_r_ + sigprocmask_argsoset_l_ + sigprocmask_argsoset_r_ sigprocmask_argsset - sigprocmask_argsset_l_ - sigprocmask_argsset_r_ + sigprocmask_argsset_l_ + sigprocmask_argsset_r_ diff --git a/doc/xml/structsysctl__args.xml b/doc/xml/structsysctl__args.xml index 5253aac..3e5b681 100644 --- a/doc/xml/structsysctl__args.xml +++ b/doc/xml/structsysctl__args.xml @@ -18,10 +18,10 @@ __sysctl - + char - char sysctl_args::name_l_[PADL_(int *)] - [PADL_(int *)] + char sysctl_args::name_l_[0] + [0] name_l_ @@ -31,10 +31,10 @@ - + char - char sysctl_args::name_r_[PADR_(int *)] - [PADR_(int *)] + char sysctl_args::name_r_[(sizeof(register_t)<=sizeof(int *)?0:sizeof(register_t)-sizeof(int *))] + [(sizeof(register_t)<=sizeof(int *)?0:sizeof(register_t)-sizeof(int *))] name_r_ @@ -58,10 +58,10 @@ __sysctl - + char - char sysctl_args::namelen_l_[PADL_(u_int)] - [PADL_(u_int)] + char sysctl_args::namelen_l_[0] + [0] namelen_l_ @@ -71,10 +71,10 @@ - + char - char sysctl_args::namelen_r_[PADR_(u_int)] - [PADR_(u_int)] + char sysctl_args::namelen_r_[(sizeof(register_t)<=sizeof(u_int)?0:sizeof(register_t)-sizeof(u_int))] + [(sizeof(register_t)<=sizeof(u_int)?0:sizeof(register_t)-sizeof(u_int))] namelen_r_ @@ -97,10 +97,10 @@ - + char - char sysctl_args::new_l_[PADL_(void *)] - [PADL_(void *)] + char sysctl_args::new_l_[0] + [0] new_l_ @@ -110,10 +110,10 @@ - + char - char sysctl_args::new_r_[PADR_(void *)] - [PADR_(void *)] + char sysctl_args::new_r_[(sizeof(register_t)<=sizeof(void *)?0:sizeof(register_t)-sizeof(void *))] + [(sizeof(register_t)<=sizeof(void *)?0:sizeof(register_t)-sizeof(void *))] new_r_ @@ -137,10 +137,10 @@ __sysctl - + char - char sysctl_args::newlen_l_[PADL_(size_t)] - [PADL_(size_t)] + char sysctl_args::newlen_l_[0] + [0] newlen_l_ @@ -150,10 +150,10 @@ - + char - char sysctl_args::newlen_r_[PADR_(size_t)] - [PADR_(size_t)] + char sysctl_args::newlen_r_[(sizeof(register_t)<=sizeof(size_t)?0:sizeof(register_t)-sizeof(size_t))] + [(sizeof(register_t)<=sizeof(size_t)?0:sizeof(register_t)-sizeof(size_t))] newlen_r_ @@ -177,10 +177,10 @@ __sysctl - + char - char sysctl_args::old_l_[PADL_(void *)] - [PADL_(void *)] + char sysctl_args::old_l_[0] + [0] old_l_ @@ -190,10 +190,10 @@ - + char - char sysctl_args::old_r_[PADR_(void *)] - [PADR_(void *)] + char sysctl_args::old_r_[(sizeof(register_t)<=sizeof(void *)?0:sizeof(register_t)-sizeof(void *))] + [(sizeof(register_t)<=sizeof(void *)?0:sizeof(register_t)-sizeof(void *))] old_r_ @@ -217,10 +217,10 @@ __sysctl - + char - char sysctl_args::oldlenp_l_[PADL_(size_t *)] - [PADL_(size_t *)] + char sysctl_args::oldlenp_l_[0] + [0] oldlenp_l_ @@ -230,10 +230,10 @@ - + char - char sysctl_args::oldlenp_r_[PADR_(size_t *)] - [PADR_(size_t *)] + char sysctl_args::oldlenp_r_[(sizeof(register_t)<=sizeof(size_t *)?0:sizeof(register_t)-sizeof(size_t *))] + [(sizeof(register_t)<=sizeof(size_t *)?0:sizeof(register_t)-sizeof(size_t *))] oldlenp_r_ @@ -251,23 +251,23 @@ sysctl_argsname - sysctl_argsname_l_ - sysctl_argsname_r_ + sysctl_argsname_l_ + sysctl_argsname_r_ sysctl_argsnamelen - sysctl_argsnamelen_l_ - sysctl_argsnamelen_r_ + sysctl_argsnamelen_l_ + sysctl_argsnamelen_r_ sysctl_argsnew - sysctl_argsnew_l_ - sysctl_argsnew_r_ + sysctl_argsnew_l_ + sysctl_argsnew_r_ sysctl_argsnewlen - sysctl_argsnewlen_l_ - sysctl_argsnewlen_r_ + sysctl_argsnewlen_l_ + sysctl_argsnewlen_r_ sysctl_argsold - sysctl_argsold_l_ - sysctl_argsold_r_ + sysctl_argsold_l_ + sysctl_argsold_r_ sysctl_argsoldlenp - sysctl_argsoldlenp_l_ - sysctl_argsoldlenp_r_ + sysctl_argsoldlenp_l_ + sysctl_argsoldlenp_r_ diff --git a/doc/xml/structsysctl__entry.xml b/doc/xml/structsysctl__entry.xml index d89291c..bfe1fe0 100644 --- a/doc/xml/structsysctl__entry.xml +++ b/doc/xml/structsysctl__entry.xml @@ -118,10 +118,10 @@ - + sysctl_entry - + prev next children diff --git a/doc/xml/structtaskStruct.xml b/doc/xml/structtaskStruct.xml index e8848df..755c6d9 100644 --- a/doc/xml/structtaskStruct.xml +++ b/doc/xml/structtaskStruct.xml @@ -75,7 +75,6 @@ mpi_destroyMbox mpi_fetchMessage mpi_postMessage - netMainThread obreak sched sched_deleteTask @@ -292,44 +291,44 @@ - + i387Struct - + tssStruct - + tty_termNode - + device_resource - + device_node - + devRec - + devInfo - + prev next - + osInfo - + cacheNode - + prev next parent @@ -337,93 +336,93 @@ fileListHead - + ubixDiskLabel - + partitions - + ubixDiskLabel::ubixPartitions - + fileDescriptorStruct - + cacheNode - + dmadat - + mp - + prev next - + vfs_mountPoint - + diskLabel - + device - + fs - + prev next - + taskStruct - + prev next - + i387 - + td - + term - + imageFd - + oInfo - + tss - + device_interface - + dmadat - + thread - + fileSystem - + prev next diff --git a/doc/xml/structthread.xml b/doc/xml/structthread.xml index 6abd52c..62b2d4b 100644 --- a/doc/xml/structthread.xml +++ b/doc/xml/structthread.xml @@ -4,10 +4,10 @@ thread thread.h - + u_int32_t - u_int32_t thread::o_files[O_FILES] - [O_FILES] + u_int32_t thread::o_files[64] + [64] o_files @@ -93,7 +93,7 @@ - threado_files + threado_files threadtd_retval threadvm_daddr threadvm_dsize diff --git a/doc/xml/structtimespec.xml b/doc/xml/structtimespec.xml index 521edff..c13f682 100644 --- a/doc/xml/structtimespec.xml +++ b/doc/xml/structtimespec.xml @@ -16,7 +16,6 @@ - cond_wait time_t @@ -30,7 +29,6 @@ - cond_wait diff --git a/doc/xml/structtimeval.xml b/doc/xml/structtimeval.xml index 529067b..c1e693e 100644 --- a/doc/xml/structtimeval.xml +++ b/doc/xml/structtimeval.xml @@ -16,9 +16,7 @@ - cond_wait gettimeofday - sys_unix_now suseconds_t @@ -32,9 +30,7 @@ - cond_wait gettimeofday - sys_unix_now diff --git a/doc/xml/structubixDiskLabel.xml b/doc/xml/structubixDiskLabel.xml index da61c3c..c0bfd35 100644 --- a/doc/xml/structubixDiskLabel.xml +++ b/doc/xml/structubixDiskLabel.xml @@ -59,10 +59,10 @@ - + ubixDiskLabel::ubixPartitions - struct ubixDiskLabel::ubixPartitions ubixDiskLabel::partitions[MAXUBIXPARTITIONS] - [MAXUBIXPARTITIONS] + struct ubixDiskLabel::ubixPartitions ubixDiskLabel::partitions[ 16 ] + [16] partitions @@ -85,14 +85,14 @@ - + ubixDiskLabel - + partitions - + ubixDiskLabel::ubixPartitions @@ -103,7 +103,7 @@ ubixDiskLabelmagicNum ubixDiskLabelmagicNum2 ubixDiskLabelnumPartitions - ubixDiskLabelpartitions + ubixDiskLabelpartitions diff --git a/doc/xml/structubixFSInfo.xml b/doc/xml/structubixFSInfo.xml index 32c642a..4c39fb7 100644 --- a/doc/xml/structubixFSInfo.xml +++ b/doc/xml/structubixFSInfo.xml @@ -77,24 +77,24 @@ - + blockAllocationTableEntry - + ubixFSInfo - + dirCache - + blockAllocationTable - + cacheNode - + prev next parent diff --git a/doc/xml/structubthread.xml b/doc/xml/structubthread.xml index 11be555..55bc92d 100644 --- a/doc/xml/structubthread.xml +++ b/doc/xml/structubthread.xml @@ -23,44 +23,44 @@ - + i387Struct - + tssStruct - + tty_termNode - + device_resource - + device_node - + devRec - + devInfo - + prev next - + osInfo - + cacheNode - + prev next parent @@ -68,100 +68,100 @@ fileListHead - + ubixDiskLabel - + partitions - + ubthread - + task - + ubixDiskLabel::ubixPartitions - + fileDescriptorStruct - + cacheNode - + dmadat - + mp - + prev next - + vfs_mountPoint - + diskLabel - + device - + fs - + prev next - + taskStruct - + prev next - + i387 - + td - + term - + imageFd - + oInfo - + tss - + device_interface - + dmadat - + thread - + fileSystem - + prev next diff --git a/doc/xml/structubthread__cond__list.xml b/doc/xml/structubthread__cond__list.xml index 59cf9eb..8b571d8 100644 --- a/doc/xml/structubthread__cond__list.xml +++ b/doc/xml/structubthread__cond__list.xml @@ -36,17 +36,17 @@ - + ubthread_cond_list - + next - + cond - + ubthread_cond diff --git a/doc/xml/structubthread__list.xml b/doc/xml/structubthread__list.xml index a17af2a..bb454ed 100644 --- a/doc/xml/structubthread__list.xml +++ b/doc/xml/structubthread__list.xml @@ -36,44 +36,44 @@ - + i387Struct - + tssStruct - + tty_termNode - + device_resource - + device_node - + devRec - + devInfo - + prev next - + osInfo - + cacheNode - + prev next parent @@ -81,110 +81,110 @@ fileListHead - + ubixDiskLabel - + partitions - + ubthread_list - + next - + thread - + ubthread - + task - + ubixDiskLabel::ubixPartitions - + fileDescriptorStruct - + cacheNode - + dmadat - + mp - + prev next - + vfs_mountPoint - + diskLabel - + device - + fs - + prev next - + taskStruct - + prev next - + i387 - + td - + term - + imageFd - + oInfo - + tss - + device_interface - + dmadat - + thread - + fileSystem - + prev next diff --git a/doc/xml/structubthread__mutex__list.xml b/doc/xml/structubthread__mutex__list.xml index 737f182..a43625d 100644 --- a/doc/xml/structubthread__mutex__list.xml +++ b/doc/xml/structubthread__mutex__list.xml @@ -36,17 +36,17 @@ - + ubthread_mutex_list - + mutex - + next - + ubthread_mutex diff --git a/doc/xml/structufs1__dinode.xml b/doc/xml/structufs1__dinode.xml index 21c283d..820ebb2 100644 --- a/doc/xml/structufs1__dinode.xml +++ b/doc/xml/structufs1__dinode.xml @@ -69,10 +69,10 @@ - + ufs1_daddr_t - ufs1_daddr_t ufs1_dinode::di_db[NDADDR] - [NDADDR] + ufs1_daddr_t ufs1_dinode::di_db[12] + [12] di_db @@ -121,10 +121,10 @@ - + ufs1_daddr_t - ufs1_daddr_t ufs1_dinode::di_ib[NIADDR] - [NIADDR] + ufs1_daddr_t ufs1_dinode::di_ib[3] + [3] di_ib @@ -212,9 +212,9 @@ - - ufs1_dinode::@7 - union ufs1_dinode::@7 ufs1_dinode::di_u + + ufs1_dinode::@1 + union ufs1_dinode::@1 ufs1_dinode::di_u di_u @@ -263,18 +263,18 @@ ufs1_dinodedi_blocks ufs1_dinodedi_ctime ufs1_dinodedi_ctimensec - ufs1_dinodedi_db + ufs1_dinodedi_db ufs1_dinodedi_flags ufs1_dinodedi_gen ufs1_dinodedi_gid - ufs1_dinodedi_ib + ufs1_dinodedi_ib ufs1_dinodedi_mode ufs1_dinodedi_mtime ufs1_dinodedi_mtimensec ufs1_dinodedi_nlink ufs1_dinodedi_size ufs1_dinodedi_spare - ufs1_dinodedi_u + ufs1_dinodedi_u ufs1_dinodedi_uid ufs1_dinodeoldids diff --git a/doc/xml/structufs2__dinode.xml b/doc/xml/structufs2__dinode.xml index 542f541..afbcca3 100644 --- a/doc/xml/structufs2__dinode.xml +++ b/doc/xml/structufs2__dinode.xml @@ -108,10 +108,10 @@ - + ufs2_daddr_t - ufs2_daddr_t ufs2_dinode::di_db[NDADDR] - [NDADDR] + ufs2_daddr_t ufs2_dinode::di_db[12] + [12] di_db @@ -122,10 +122,10 @@ fsread - + ufs2_daddr_t - ufs2_daddr_t ufs2_dinode::di_extb[NXADDR] - [NXADDR] + ufs2_daddr_t ufs2_dinode::di_extb[2] + [2] di_extb @@ -187,10 +187,10 @@ - + ufs2_daddr_t - ufs2_daddr_t ufs2_dinode::di_ib[NIADDR] - [NIADDR] + ufs2_daddr_t ufs2_dinode::di_ib[3] + [3] di_ib @@ -321,13 +321,13 @@ ufs2_dinodedi_blocks ufs2_dinodedi_ctime ufs2_dinodedi_ctimensec - ufs2_dinodedi_db - ufs2_dinodedi_extb + ufs2_dinodedi_db + ufs2_dinodedi_extb ufs2_dinodedi_extsize ufs2_dinodedi_flags ufs2_dinodedi_gen ufs2_dinodedi_gid - ufs2_dinodedi_ib + ufs2_dinodedi_ib ufs2_dinodedi_kernflags ufs2_dinodedi_mode ufs2_dinodedi_mtime diff --git a/doc/xml/structuserFileDescriptorStruct.xml b/doc/xml/structuserFileDescriptorStruct.xml index b559e12..bdf0c5e 100644 --- a/doc/xml/structuserFileDescriptorStruct.xml +++ b/doc/xml/structuserFileDescriptorStruct.xml @@ -43,28 +43,28 @@ - + device_resource - + device_node - + devRec - + devInfo - + prev next - + cacheNode - + prev next parent @@ -72,70 +72,70 @@ fileListHead - + ubixDiskLabel - + partitions - + ubixDiskLabel::ubixPartitions - + fileDescriptorStruct - + cacheNode - + dmadat - + mp - + prev next - + vfs_mountPoint - + diskLabel - + device - + fs - + prev next - + device_interface - + userFileDescriptorStruct - + fd - + dmadat - + fileSystem - + prev next diff --git a/doc/xml/structvfs__mountPoint.xml b/doc/xml/structvfs__mountPoint.xml index b3aafa7..698f9c7 100644 --- a/doc/xml/structvfs__mountPoint.xml +++ b/doc/xml/structvfs__mountPoint.xml @@ -15,7 +15,7 @@ - + dskread openFileUbixFS syncBat @@ -37,7 +37,7 @@ - + syncBat ubixfs_initialize ubixfs_loadData @@ -57,7 +57,7 @@ - + fgetc fopen fputc @@ -78,7 +78,7 @@ - + devfs_initialize devfs_makeNode devfs_open @@ -105,7 +105,7 @@ - + unlink vfs_findMount vfs_mount @@ -121,7 +121,7 @@ - + vfs_addMount vfs_findMount @@ -136,7 +136,7 @@ - + syncBat ubixfs_initialize ubixfs_loadData @@ -157,7 +157,7 @@ - + vfs_mount @@ -171,7 +171,7 @@ - + vfs_addMount @@ -180,66 +180,66 @@ - + device_resource - + device_node - + devRec - + devInfo - + prev next - + ubixDiskLabel - + partitions - + ubixDiskLabel::ubixPartitions - + vfs_mountPoint - + diskLabel - + device - + fs - + prev next - + device_interface - + fileSystem - + prev next - + vfs_mountPointdevice vfs_mountPointdiskLabel diff --git a/doc/xml/structvitalsStruct.xml b/doc/xml/structvitalsStruct.xml index 1c2a094..1c715a0 100644 --- a/doc/xml/structvitalsStruct.xml +++ b/doc/xml/structvitalsStruct.xml @@ -203,70 +203,70 @@ - + device_resource - + device_node - + devRec - + devInfo - + prev next - + ubixDiskLabel - + partitions - + ubixDiskLabel::ubixPartitions - + vfs_mountPoint - + diskLabel - + device - + fs - + prev next - + vitalsStruct - + fileSystems - + mountPoints - + device_interface - + fileSystem - + prev next diff --git a/doc/xml/structwrite__args.xml b/doc/xml/structwrite__args.xml index 7fda8e9..8a27cac 100644 --- a/doc/xml/structwrite__args.xml +++ b/doc/xml/structwrite__args.xml @@ -18,10 +18,10 @@ sys_write - + char - char write_args::buf_l_[PADL_(const void *)] - [PADL_(const void *)] + char write_args::buf_l_[0] + [0] buf_l_ @@ -31,10 +31,10 @@ - + char - char write_args::buf_r_[PADR_(const void *)] - [PADR_(const void *)] + char write_args::buf_r_[(sizeof(register_t)<=sizeof(const void *)?0:sizeof(register_t)-sizeof(const void *))] + [(sizeof(register_t)<=sizeof(const void *)?0:sizeof(register_t)-sizeof(const void *))] buf_r_ @@ -58,10 +58,10 @@ sys_write - + char - char write_args::fd_l_[PADL_(int)] - [PADL_(int)] + char write_args::fd_l_[0] + [0] fd_l_ @@ -71,10 +71,10 @@ - + char - char write_args::fd_r_[PADR_(int)] - [PADR_(int)] + char write_args::fd_r_[(sizeof(register_t)<=sizeof(int)?0:sizeof(register_t)-sizeof(int))] + [(sizeof(register_t)<=sizeof(int)?0:sizeof(register_t)-sizeof(int))] fd_r_ @@ -98,10 +98,10 @@ sys_write - + char - char write_args::nbyte_l_[PADL_(size_t)] - [PADL_(size_t)] + char write_args::nbyte_l_[0] + [0] nbyte_l_ @@ -111,10 +111,10 @@ - + char - char write_args::nbyte_r_[PADR_(size_t)] - [PADR_(size_t)] + char write_args::nbyte_r_[(sizeof(register_t)<=sizeof(size_t)?0:sizeof(register_t)-sizeof(size_t))] + [(sizeof(register_t)<=sizeof(size_t)?0:sizeof(register_t)-sizeof(size_t))] nbyte_r_ @@ -132,14 +132,14 @@ write_argsbuf - write_argsbuf_l_ - write_argsbuf_r_ + write_argsbuf_l_ + write_argsbuf_r_ write_argsfd - write_argsfd_l_ - write_argsfd_r_ + write_argsfd_l_ + write_argsfd_r_ write_argsnbyte - write_argsnbyte_l_ - write_argsnbyte_r_ + write_argsnbyte_l_ + write_argsnbyte_r_ diff --git a/doc/xml/syscall_8c.xml b/doc/xml/syscall_8c.xml index 880e244..a4f82ea 100644 --- a/doc/xml/syscall_8c.xml +++ b/doc/xml/syscall_8c.xml @@ -21,283 +21,281 @@ mpi/mpi.h vmm/vmm.h - + sys/thread.h - + - + ubixos/sched.h - + - + - + - + - + - + - + ubixos/endtask.h - + - + - + ubixos/syscall.h - + - + ubixos/vitals.h - + - + - + - + - + ubixos/types.h - + - + sys/_types.h - + sys/video.h - + - + lib/string.h - + - + vmm/paging.h - + - + - + - + ubixos/time.h - + - + - + vfs/file.h - + - + - + - + sys/tss.h - + - + lib/kmalloc.h - + - + vmm/vmm.h - + - + - + mpi/mpi.h - + - + - + vfs/vfs.h - + - + - + - + - + - + vfs/mount.h - - - + - + lib/kprintf.h - + - + ubixfs/ubixfs.h - + - + - + - + - + - + ubixos/ubthread.h - + - + - + - + src/sys/kernel/syscall.c - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + ubixfs/dirCache.h - + - + ubixos/exec.h - + - + - + ubixos/syscalls.h - + - + - + sys/sysproto.h - + - + - + ubixos/elf.h - + - + sys/signal.h - + - + ubixos/tty.h - + - + sys/io.h - + sys/device.h - + - + sys/trap.h diff --git a/doc/xml/syscall_8h.xml b/doc/xml/syscall_8h.xml index 7645fee..6b5fb6c 100644 --- a/doc/xml/syscall_8h.xml +++ b/doc/xml/syscall_8h.xml @@ -6,37 +6,37 @@ src/sys/kernel/syscall.c src/sys/sys/idt.c - + src/sys/include/ubixos/syscall.h - + - + ubixos/types.h - + - + sys/_types.h - + src/sys/include/ubixos/syscall.h - + - + - + src/sys/kernel/syscall.c - + src/sys/sys/idt.c diff --git a/doc/xml/syscall__new_8c.xml b/doc/xml/syscall__new_8c.xml index afaa832..ff8cd0b 100644 --- a/doc/xml/syscall__new_8c.xml +++ b/doc/xml/syscall__new_8c.xml @@ -11,161 +11,145 @@ lib/string.h lib/kprintf.h - + sys/thread.h - + - + ubixos/sched.h - + - + - + - + - + - + - + ubixos/spinlock.h - + - + ubixos/endtask.h - + - + - + ubixos/types.h - + - + sys/_types.h - + lib/string.h - + - + vfs/file.h - + - + - + - + sys/tss.h - + - - vfs/vfs.h - - - - - - - - - - - - - + vfs/mount.h - - - + - + lib/kprintf.h - + - + ubixfs/dirCache.h - + - + sys/sysproto.h - + - + - + ubixos/elf.h - + - + sys/signal.h - + - + ubixos/tty.h - + - + src/sys/kernel/syscall_new.c - + - + - + - + - + - + - + - + - + ubixos/syscalls_new.h - + - + sys/trap.h diff --git a/doc/xml/syscalls_8h.xml b/doc/xml/syscalls_8h.xml index aae6201..3acb554 100644 --- a/doc/xml/syscalls_8h.xml +++ b/doc/xml/syscalls_8h.xml @@ -6,126 +6,96 @@ vfs/file.h src/sys/kernel/syscall.c - + sys/thread.h - + - + ubixos/sched.h - + - + - + - + - + - + - + ubixos/types.h - + - + sys/_types.h - + vfs/file.h - + - + - + - + sys/tss.h - + - - vfs/vfs.h - - - - - - - - - - - - - + vfs/mount.h - - - + - + ubixfs/dirCache.h - + - + src/sys/include/ubixos/syscalls.h - + - + - - sys/sysproto.h - - - - - - - + ubixos/elf.h - + - - sys/signal.h - - - - - + ubixos/tty.h - + - + src/sys/kernel/syscall.c - + src/sys/include/ubixos/syscalls.h - + diff --git a/doc/xml/syscalls__new_8h.xml b/doc/xml/syscalls__new_8h.xml index 1065ed1..b4eb65c 100644 --- a/doc/xml/syscalls__new_8h.xml +++ b/doc/xml/syscalls__new_8h.xml @@ -5,52 +5,52 @@ sys/sysproto.h src/sys/kernel/syscall_new.c - + sys/thread.h - + - + ubixos/types.h - + - + sys/_types.h - + sys/sysproto.h - + - + - + sys/signal.h - + - + src/sys/include/ubixos/syscalls_new.h - + - + src/sys/kernel/syscall_new.c - + src/sys/include/ubixos/syscalls_new.h - + diff --git a/doc/xml/sysproto_8h.xml b/doc/xml/sysproto_8h.xml index 557a06a..f12a978 100644 --- a/doc/xml/sysproto_8h.xml +++ b/doc/xml/sysproto_8h.xml @@ -17,729 +17,483 @@ src/sys/kernel/kern_sysctl.c src/sys/kernel/pipe.c - + sys/thread.h - + - + ubixos/types.h - + - + sys/_types.h - + src/sys/include/sys/sysproto.h - + - + - + sys/signal.h - + - + src/sys/ufs/ffs.c - + src/sys/include/ufs/ufs.h - + - + - + - - src/sys/include/ubixos/sched.h - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + src/sys/pci/hd.c - - src/sys/net/netif/tcpdump.c - - - + src/sys/include/ufs/ffs.h - + - + - - src/sys/include/ubixos/endtask.h - - - - - - - - - - - - - - - - - - - - - - - - src/sys/net/net/sys_arch.c - - - + src/sys/kernel/vitals.c - - src/sys/include/devfs/devfs.h - - - - - - - - - - - - src/sys/mpi/message.c - - - + src/sys/kmods/kmod.c - - src/sys/mpi/system.c - - - + src/sys/kernel/kern_sysctl.c - + src/sys/include/ubixos/vitals.h - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + src/sys/kernel/pipe.c - + src/sys/lib/kmalloc.c - + src/sys/vmm/paging.c - + src/sys/ubixfs/directory.c - + src/sys/ufs/ufs.c - + src/sys/kernel/kern_sig.c - + src/sys/kernel/ubthread.c - + src/sys/kernel/systemtask.c - - src/sys/net/netif/ethernetif.c - - - + src/sys/lib/ogprintf.cc - + src/sys/include/vmm/paging.h - + - + - + src/sys/kernel/ld.c - - src/sys/include/vfs/file.h - - - - - - - - - - - - - - - - - - - - - - - + src/sys/include/sys/pipe.h - + - + src/sys/kernel/fork.c - + src/sys/vmm/createvirtualspace.c - + src/sys/vmm/vmm_init.c - - src/sys/net/api/tcpip.c - - - + src/sys/ubixfs/block.c - + src/sys/include/sys/kern_sysctl.h - + - + - + - + src/sys/include/vmm/vmm.h - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + src/sys/kernel/sched.c - - src/sys/net/net/shell.c - - - + src/sys/vmm/setpageattributes.c - - src/sys/include/mpi/mpi.h - - - - - - - - - - - - - + src/sys/include/sys/gen_calls.h - + - + src/sys/vmm/getphysicaladdr.c - - src/sys/include/ubixos/fork.h - - - - - - - + src/sys/ubixfs/dirCache.c - + src/sys/ubixfs/ubixfs.c - - src/sys/net/net/init.c - - - + src/sys/include/vfs/vfs.h - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + - - src/sys/include/vfs/mount.h - - - - - - - - - - - - - - - - - - - + src/sys/init/main.c - + src/sys/include/ubixfs/ubixfs.h - + - + - + - + - + - + - + - + - + src/sys/kernel/bioscall.c - + src/sys/include/sys/kern_descrip.h - + - + - + - + - + - - src/sys/include/ubixos/ubthread.h - - - - - - - - - + src/sys/kernel/syscall.c - + src/sys/include/sys/kern_sig.h - + - + src/sys/isa/ne2k.c - - src/sys/include/ubixos/exec.h - - - - - - - - - - - - - - - - - - - - src/sys/include/ubixos/syscalls.h - - - - - + src/sys/include/pci/hd.h - + - + - + src/sys/isa/atkbd.c - + src/sys/vmm/pagefault.c - + src/sys/ubixfs/thread.c - + src/sys/include/ubixos/init.h - - + + - + src/sys/vfs/mount.c - + src/sys/devfs/devfs.c - + src/sys/include/sys/sysproto.h - + - + - + - + - + - + - + - + - + - + - + - + - + src/sys/vmm/unmappage.c - + src/sys/kernel/time.c - + src/sys/vmm/vmm_memory.c - - src/sys/kernel/spinlock.c - - - + src/sys/kernel/kern_descrip.c - + src/sys/kernel/endtask.c - + src/sys/vfs/file.c - + src/sys/vmm/getfreepage.c - + src/sys/sys/idt.c - + src/sys/kernel/gen_calls.c - + src/sys/kernel/syscall_new.c - + src/sys/kernel/exec.c - + src/sys/include/ubixos/syscalls_new.h - + - + src/sys/include/sys/buf.h - + - - src/sys/isa/fdc.c - - - + src/sys/vmm/getfreevirtualpage.c - + src/sys/vmm/copyvirtualspace.c - + src/sys/vfs/vfs.c @@ -907,7 +661,6 @@ write_args::buf - buffer write_args::fd kfree kmalloc @@ -973,32 +726,32 @@ //Protos structwrite_args{ -charfd_l_[PADL_(int)];intfd;charfd_r_[PADR_(int)]; -charbuf_l_[PADL_(constvoid*)];constvoid*buf;charbuf_r_[PADR_(constvoid*)]; -charnbyte_l_[PADL_(size_t)];size_tnbyte;charnbyte_r_[PADR_(size_t)]; +charfd_l_[PADL_(int)];intfd;charfd_r_[PADR_(int)]; +charbuf_l_[PADL_(constvoid*)];constvoid*buf;charbuf_r_[PADR_(constvoid*)]; +charnbyte_l_[PADL_(size_t)];size_tnbyte;charnbyte_r_[PADR_(size_t)]; }; structopen_args{ -charpath_l_[PADL_(char*)];char*path;charpath_r_[PADR_(char*)]; -charflags_l_[PADL_(int)];intflags;charflags_r_[PADR_(int)]; -charmode_l_[PADL_(int)];intmode;charmode_r_[PADR_(int)]; +charpath_l_[PADL_(char*)];char*path;charpath_r_[PADR_(char*)]; +charflags_l_[PADL_(int)];intflags;charflags_r_[PADR_(int)]; +charmode_l_[PADL_(int)];intmode;charmode_r_[PADR_(int)]; }; structsetitimer_args{ -charwhich_l_[PADL_(u_int)];u_intwhich;charwhich_r_[PADR_(u_int)]; -charitv_l_[PADL_(structitimerval*)];structitimerval*itv;charitv_r_[PADR_(structitimerval*)]; -charoitv_l_[PADL_(structitimerval*)];structitimerval*oitv;charoitv_r_[PADR_(structitimerval*)]; +charwhich_l_[PADL_(u_int)];u_intwhich;charwhich_r_[PADR_(u_int)]; +charitv_l_[PADL_(structitimerval*)];structitimerval*itv;charitv_r_[PADR_(structitimerval*)]; +charoitv_l_[PADL_(structitimerval*)];structitimerval*oitv;charoitv_r_[PADR_(structitimerval*)]; }; //Old structsysctl_args{ -charname_l_[PADL_(int*)];int*name;charname_r_[PADR_(int*)]; -charnamelen_l_[PADL_(u_int)];u_intnamelen;charnamelen_r_[PADR_(u_int)]; -charold_l_[PADL_(void*)];void*old;charold_r_[PADR_(void*)]; -charoldlenp_l_[PADL_(size_t*)];size_t*oldlenp;charoldlenp_r_[PADR_(size_t*)]; -charnew_l_[PADL_(void*)];void*new;charnew_r_[PADR_(void*)]; -charnewlen_l_[PADL_(size_t)];size_tnewlen;charnewlen_r_[PADR_(size_t)]; +charname_l_[PADL_(int*)];int*name;charname_r_[PADR_(int*)]; +charnamelen_l_[PADL_(u_int)];u_intnamelen;charnamelen_r_[PADR_(u_int)]; +charold_l_[PADL_(void*)];void*old;charold_r_[PADR_(void*)]; +charoldlenp_l_[PADL_(size_t*)];size_t*oldlenp;charoldlenp_r_[PADR_(size_t*)]; +charnew_l_[PADL_(void*)];void*new;charnew_r_[PADR_(void*)]; +charnewlen_l_[PADL_(size_t)];size_tnewlen;charnewlen_r_[PADR_(size_t)]; }; structgetpid_args{ @@ -1008,9 +761,9 @@ register_tdummy; }; structfcntl_args{ -charfd_l_[PADL_(int)];intfd;charfd_r_[PADR_(int)]; -charcmd_l_[PADL_(int)];intcmd;charcmd_r_[PADR_(int)]; -chararg_l_[PADL_(long)];longarg;chararg_r_[PADR_(long)]; +charfd_l_[PADL_(int)];intfd;charfd_r_[PADR_(int)]; +charcmd_l_[PADL_(int)];intcmd;charcmd_r_[PADR_(int)]; +chararg_l_[PADL_(long)];longarg;chararg_r_[PADR_(long)]; }; structpipe_args{ @@ -1018,9 +771,9 @@ }; structreadlink_args{ -charpath_l_[PADL_(char*)];char*path;charpath_r_[PADR_(char*)]; -charbuf_l_[PADL_(char*)];char*buf;charbuf_r_[PADR_(char*)]; -charcount_l_[PADL_(int)];intcount;charcount_r_[PADR_(int)]; +charpath_l_[PADL_(char*)];char*path;charpath_r_[PADR_(char*)]; +charbuf_l_[PADL_(char*)];char*buf;charbuf_r_[PADR_(char*)]; +charcount_l_[PADL_(int)];intcount;charcount_r_[PADR_(int)]; }; structgetuid_args{ @@ -1031,27 +784,27 @@ register_tdummy; }; structclose_args{ -charfd_l_[PADL_(int)];intfd;charfd_r_[PADR_(int)]; +charfd_l_[PADL_(int)];intfd;charfd_r_[PADR_(int)]; }; structmmap_args{ -charaddr_l_[PADL_(caddr_t)];caddr_taddr;charaddr_r_[PADR_(caddr_t)]; -charlen_l_[PADL_(size_t)];size_tlen;charlen_r_[PADR_(size_t)]; -charprot_l_[PADL_(int)];intprot;charprot_r_[PADR_(int)]; -charflags_l_[PADL_(int)];intflags;charflags_r_[PADR_(int)]; -charfd_l_[PADL_(int)];intfd;charfd_r_[PADR_(int)]; -charpad_l_[PADL_(int)];intpad;charpad_r_[PADR_(int)]; -charpos_l_[PADL_(off_t)];off_tpos;charpos_r_[PADR_(off_t)]; +charaddr_l_[PADL_(caddr_t)];caddr_taddr;charaddr_r_[PADR_(caddr_t)]; +charlen_l_[PADL_(size_t)];size_tlen;charlen_r_[PADR_(size_t)]; +charprot_l_[PADL_(int)];intprot;charprot_r_[PADR_(int)]; +charflags_l_[PADL_(int)];intflags;charflags_r_[PADR_(int)]; +charfd_l_[PADL_(int)];intfd;charfd_r_[PADR_(int)]; +charpad_l_[PADL_(int)];intpad;charpad_r_[PADR_(int)]; +charpos_l_[PADL_(off_t)];off_tpos;charpos_r_[PADR_(off_t)]; }; structobreak_args{ -charnsize_l_[PADL_(char*)];char*nsize;charnsize_r_[PADR_(char*)]; +charnsize_l_[PADL_(char*)];char*nsize;charnsize_r_[PADR_(char*)]; }; structsigaction_args{ -charsig_l_[PADL_(int)];intsig;charsig_r_[PADR_(int)]; -charact_l_[PADL_(conststructsigaction*)];conststructsigaction*act;charact_r_[PADR_(conststructsigaction*)]; -charoact_l_[PADL_(structsigaction*)];structsigaction*oact;charoact_r_[PADR_(structsigaction*)]; +charsig_l_[PADL_(int)];intsig;charsig_r_[PADR_(int)]; +charact_l_[PADL_(conststructsigaction*)];conststructsigaction*act;charact_r_[PADR_(conststructsigaction*)]; +charoact_l_[PADL_(structsigaction*)];structsigaction*oact;charoact_r_[PADR_(structsigaction*)]; }; structgetdtablesize_args{ @@ -1059,33 +812,33 @@ }; structmunmap_args{ -charaddr_l_[PADL_(void*)];void*addr;charaddr_r_[PADR_(void*)]; -charlen_l_[PADL_(size_t)];size_tlen;charlen_r_[PADR_(size_t)]; +charaddr_l_[PADL_(void*)];void*addr;charaddr_r_[PADR_(void*)]; +charlen_l_[PADL_(size_t)];size_tlen;charlen_r_[PADR_(size_t)]; }; structsigprocmask_args{ -charhow_l_[PADL_(int)];inthow;charhow_r_[PADR_(int)]; -charset_l_[PADL_(constsigset_t*)];constsigset_t*set;charset_r_[PADR_(constsigset_t*)]; -charoset_l_[PADL_(sigset_t*)];sigset_t*oset;charoset_r_[PADR_(sigset_t*)]; +charhow_l_[PADL_(int)];inthow;charhow_r_[PADR_(int)]; +charset_l_[PADL_(constsigset_t*)];constsigset_t*set;charset_r_[PADR_(constsigset_t*)]; +charoset_l_[PADL_(sigset_t*)];sigset_t*oset;charoset_r_[PADR_(sigset_t*)]; }; structgettimeofday_args{ -chartp_l_[PADL_(structtimeval*)];structtimeval*tp;chartp_r_[PADR_(structtimeval*)]; -chartzp_l_[PADL_(structtimezone*)];structtimezone*tzp;chartzp_r_[PADR_(structtimezone*)]; +chartp_l_[PADL_(structtimeval*)];structtimeval*tp;chartp_r_[PADR_(structtimeval*)]; +chartzp_l_[PADL_(structtimezone*)];structtimezone*tzp;chartzp_r_[PADR_(structtimezone*)]; }; structfstat_args{ -charfd_l_[PADL_(int)];intfd;charfd_r_[PADR_(int)]; -charsb_l_[PADL_(structstat*)];structstat*sb;charsb_r_[PADR_(structstat*)]; +charfd_l_[PADL_(int)];intfd;charfd_r_[PADR_(int)]; +charsb_l_[PADL_(structstat*)];structstat*sb;charsb_r_[PADR_(structstat*)]; }; structioctl_args{ -charfd_l_[PADL_(int)];intfd;charfd_r_[PADR_(int)]; -charcom_l_[PADL_(u_long)];u_longcom;charcom_r_[PADR_(u_long)]; -chardata_l_[PADL_(caddr_t)];caddr_tdata;chardata_r_[PADR_(caddr_t)]; +charfd_l_[PADL_(int)];intfd;charfd_r_[PADR_(int)]; +charcom_l_[PADL_(u_long)];u_longcom;charcom_r_[PADR_(u_long)]; +chardata_l_[PADL_(caddr_t)];caddr_tdata;chardata_r_[PADR_(caddr_t)]; }; structread_args{ -charfd_l_[PADL_(int)];intfd;charfd_r_[PADR_(int)]; -charbuf_l_[PADL_(void*)];void*buf;charbuf_r_[PADR_(void*)]; -charnbyte_l_[PADL_(size_t)];size_tnbyte;charnbyte_r_[PADR_(size_t)]; +charfd_l_[PADL_(int)];intfd;charfd_r_[PADR_(int)]; +charbuf_l_[PADL_(void*)];void*buf;charbuf_r_[PADR_(void*)]; +charnbyte_l_[PADL_(size_t)];size_tnbyte;charnbyte_r_[PADR_(size_t)]; }; //FuncDefs diff --git a/doc/xml/system_8c.xml b/doc/xml/system_8c.xml index a1258ba..77c0fa2 100644 --- a/doc/xml/system_8c.xml +++ b/doc/xml/system_8c.xml @@ -7,144 +7,114 @@ lib/string.h ubixos/spinlock.h - + sys/thread.h - + - + ubixos/sched.h - + - + - + - + - + - + - + ubixos/spinlock.h - + - + src/sys/mpi/system.c - + - + - + - + - + ubixos/types.h - + - + sys/_types.h - + lib/string.h - + - + vfs/file.h - + - + - + - + sys/tss.h - + - + lib/kmalloc.h - + - + mpi/mpi.h - + - + - - vfs/vfs.h - - - - - - - - - - - - - + vfs/mount.h - - - + - + ubixfs/dirCache.h - + - - sys/sysproto.h - - - - - - - + ubixos/elf.h - + - - sys/signal.h - - - - - + ubixos/tty.h - + @@ -168,10 +138,12 @@ _current taskStruct::id kmalloc - mbox mboxList mpi_findMbox mpiSpinLock + mpi_mbox::name + mpi_mbox::next + mpi_mbox::pid mpi_mbox::prev spinLock spinUnlock @@ -199,9 +171,12 @@ _current taskStruct::id kfree - mbox mboxList mpiSpinLock + mpi_mbox::name + mpi_mbox::next + mpi_mbox::pid + mpi_mbox::prev spinLock spinUnlock strcmp @@ -228,16 +203,18 @@ _current - mpi_message::data + mpi_message::data mpi_message::header taskStruct::id kfree - mbox memcpy MESSAGE_LENGTH mpi_findMbox mpiSpinLock + mpi_mbox::msg + mpi_message::next mpi_message::pid + mpi_mbox::pid spinLock spinUnlock sysMpiFetchMessage @@ -260,8 +237,9 @@ - mbox mboxList + mpi_mbox::name + mpi_mbox::next strcmp mpi_createMbox mpi_fetchMessage @@ -292,15 +270,16 @@ _current - mpi_message::data + mpi_message::data mpi_message::header taskStruct::id kmalloc - mbox memcpy MESSAGE_LENGTH mpi_findMbox mpiSpinLock + mpi_mbox::msg + mpi_mbox::msgLast mpi_message::next mpi_message::pid spinLock @@ -328,15 +307,17 @@ - mpi_message::data + mpi_message::data mpi_message::header kmalloc - mbox mboxList memcpy MESSAGE_LENGTH mpiSpinLock + mpi_mbox::msg + mpi_mbox::msgLast mpi_message::next + mpi_mbox::next spinLock spinUnlock sysMpiSpam @@ -433,11 +414,11 @@ *****************************************************************************************/ staticmpi_mbox_t*mpi_findMbox(char*name){ -mpi_mbox_t*mbox=0x0; +mpi_mbox_t*mbox=0x0; -for(mbox=mboxList;mbox;mbox=mbox->next){ -if(!strcmp(mbox->name,name)){ -return(mbox); +for(mbox=mboxList;mbox;mbox=mbox->next){ +if(!strcmp(mbox->name,name)){ +return(mbox); } } @@ -455,7 +436,7 @@ *****************************************************************************************/ intmpi_createMbox(char*name){ -mpi_mbox_t*mbox=0x0; +mpi_mbox_t*mbox=0x0; spinLock(&mpiSpinLock); if(mpi_findMbox(name)!=0x0){ @@ -463,21 +444,21 @@ return(-1); } -mbox=(mpi_mbox_t*)kmalloc(sizeof(mpi_mbox_t)); +mbox=(mpi_mbox_t*)kmalloc(sizeof(mpi_mbox_t)); -sprintf(mbox->name,name); -mbox->pid=_current->id; +sprintf(mbox->name,name); +mbox->pid=_current->id; if(mboxList==0x0){ -mbox->prev=0x0; -mbox->next=0x0; -mboxList=mbox; +mbox->prev=0x0; +mbox->next=0x0; +mboxList=mbox; } else{ -mbox->next=mboxList; -mbox->prev=0x0; -mboxList->prev=mbox; -mboxList=mbox; +mbox->next=mboxList; +mbox->prev=0x0; +mboxList->prev=mbox; +mboxList=mbox; } spinUnlock(&mpiSpinLock); @@ -494,24 +475,24 @@ *****************************************************************************************/ intmpi_spam(uInt32type,void*data){ -mpi_mbox_t*mbox=0x0; +mpi_mbox_t*mbox=0x0; mpi_message_t*message=0x0; spinLock(&mpiSpinLock); -for(mbox=mboxList;mbox;mbox=mbox->next){ +for(mbox=mboxList;mbox;mbox=mbox->next){ message=(mpi_message_t*)kmalloc(sizeof(mpi_message_t)); message->header=type; -memcpy(message->data,data,MESSAGE_LENGTH); +memcpy(message->data,data,MESSAGE_LENGTH); message->next=0x0; -if(mbox->msg==0x0){ -mbox->msg=message; +if(mbox->msg==0x0){ +mbox->msg=message; } else{ -mbox->msgLast->next=message; -mbox->msgLast=message; +mbox->msgLast->next=message; +mbox->msgLast=message; } } @@ -529,14 +510,14 @@ *****************************************************************************************/ intmpi_postMessage(char*name,uInt32type,mpi_message_t*msg){ -mpi_mbox_t*mbox=0x0; +mpi_mbox_t*mbox=0x0; mpi_message_t*message=0x0; spinLock(&mpiSpinLock); -mbox=mpi_findMbox(name); +mbox=mpi_findMbox(name); -if(mbox==0x0){ +if(mbox==0x0){ spinUnlock(&mpiSpinLock); return(0x1); } @@ -544,22 +525,22 @@ message=(mpi_message_t*)kmalloc(sizeof(mpi_message_t)); message->header=msg->header; -memcpy(message->data,msg->data,MESSAGE_LENGTH); +memcpy(message->data,msg->data,MESSAGE_LENGTH); message->pid=_current->id; message->next=0x0; -if(mbox->msg==0x0){ -mbox->msg=message; +if(mbox->msg==0x0){ +mbox->msg=message; } else{ -mbox->msgLast->next=message; -mbox->msgLast=message; +mbox->msgLast->next=message; +mbox->msgLast=message; } spinUnlock(&mpiSpinLock); if(type==0x2){ -while(mbox->msgLast!=0x0); +while(mbox->msgLast!=0x0); } return(0x0); @@ -575,34 +556,34 @@ *****************************************************************************************/ intmpi_fetchMessage(char*name,mpi_message_t*msg){ -mpi_mbox_t*mbox=0x0; +mpi_mbox_t*mbox=0x0; mpi_message_t*tmpMsg=0x0; spinLock(&mpiSpinLock); -mbox=mpi_findMbox(name); +mbox=mpi_findMbox(name); -if(mbox==0x0){ +if(mbox==0x0){ spinUnlock(&mpiSpinLock); return(-1); } -if(mbox->msg==0x0){ +if(mbox->msg==0x0){ spinUnlock(&mpiSpinLock); return(-1); } -if(mbox->pid!=_current->id){ +if(mbox->pid!=_current->id){ spinUnlock(&mpiSpinLock); return(-1); } -msg->header=mbox->msg->header; -memcpy(msg->data,mbox->msg->data,MESSAGE_LENGTH); -msg->pid=mbox->msg->pid; +msg->header=mbox->msg->header; +memcpy(msg->data,mbox->msg->data,MESSAGE_LENGTH); +msg->pid=mbox->msg->pid; -tmpMsg=mbox->msg; -mbox->msg=mbox->msg->next; +tmpMsg=mbox->msg; +mbox->msg=mbox->msg->next; kfree(tmpMsg); @@ -620,19 +601,19 @@ *****************************************************************************************/ intmpi_destroyMbox(char*name){ -mpi_mbox_t*mbox=0x0; +mpi_mbox_t*mbox=0x0; spinLock(&mpiSpinLock); -for(mbox=mboxList;mbox;mbox=mbox->next){ -if(!strcmp(mbox->name,name)){ -if(mbox->pid!=_current->id){ +for(mbox=mboxList;mbox;mbox=mbox->next){ +if(!strcmp(mbox->name,name)){ +if(mbox->pid!=_current->id){ spinUnlock(&mpiSpinLock); return(-1); } -mbox->prev->next=mbox->next; -mbox->next->prev=mbox->prev; -kfree(mbox); +mbox->prev->next=mbox->next; +mbox->next->prev=mbox->prev; +kfree(mbox); spinUnlock(&mpiSpinLock); return(0x0); } diff --git a/doc/xml/systemtask_8c.xml b/doc/xml/systemtask_8c.xml index da018ac..7a45616 100644 --- a/doc/xml/systemtask_8c.xml +++ b/doc/xml/systemtask_8c.xml @@ -17,245 +17,243 @@ mpi/mpi.h string.h - + sys/thread.h - + - + ubixos/kpanic.h - + ubixos/sched.h - + - + - + - + - + - + - + lib/bioscall.h - + - + ubixos/vitals.h - + - + - + - + - + ubixos/systemtask.h - + - + ubixos/types.h - + - + sys/_types.h - + src/sys/kernel/systemtask.c - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + vmm/paging.h - + - + - + - + string.h - + - + ubixos/time.h - + - + - + vfs/file.h - + - + - + - + sys/tss.h - + - + lib/kmalloc.h - + - + vmm/vmm.h - + - + - + mpi/mpi.h - + - + - + vfs/vfs.h - + - + - + - + - + - + vfs/mount.h - - - + - + lib/kprintf.h - + - + ubixos/ubthread.h - + - + - + - + ubixfs/dirCache.h - + - + sde/sde.h - + - + ubixos/exec.h - + - + - + sys/sysproto.h - + - + - + ubixos/elf.h - + - + sys/signal.h - + - + ubixos/tty.h - + - + sys/io.h @@ -274,7 +272,7 @@ biosCall - mpi_message::data + mpi_message::data fclose mpi_message::header taskStruct::id @@ -391,7 +389,7 @@ kprintf("A"); switch(myMsg.header){ case0x69: -x=(int*)&myMsg.data; +x=(int*)&myMsg.data; kprintf("Switchingtoterm:[%i][%i]\n",*x,myMsg.pid); schedFindTask(myMsg.pid)->term=tty_find(*x); break; @@ -409,21 +407,21 @@ kprintf("system:backdooropened\n"); break; case0x80: -if(!strcmp(myMsg.data,"sdeStart")){ +if(!strcmp(myMsg.data,"sdeStart")){ kprintf("StartingSDE\n"); //execThread(sdeThread,(uInt32)(kmalloc(0x2000)+0x2000),0x0); } -elseif(!strcmp(myMsg.data,"freePage")){ +elseif(!strcmp(myMsg.data,"freePage")){ kprintf("kkkFreePages"); } -elseif(!strcmp(myMsg.data,"sdeStop")){ +elseif(!strcmp(myMsg.data,"sdeStop")){ printOff=0x0; biosCall(0x10,0x3,0x0,0x0,0x0,0x0,0x0,0x0,0x0); for(i=0x0;i<100;i++)asm("hlt"); } break; default: -kprintf("system:Receivedmessage%i:%s\n",myMsg.header,myMsg.data); +kprintf("system:Receivedmessage%i:%s\n",myMsg.header,myMsg.data); break; } } diff --git a/doc/xml/systemtask_8h.xml b/doc/xml/systemtask_8h.xml index e6a60f0..06c43aa 100644 --- a/doc/xml/systemtask_8h.xml +++ b/doc/xml/systemtask_8h.xml @@ -6,37 +6,37 @@ src/sys/init/main.c src/sys/kernel/systemtask.c - + src/sys/include/ubixos/systemtask.h - + - + ubixos/types.h - + - + sys/_types.h - + src/sys/include/ubixos/systemtask.h - + - + - + src/sys/kernel/systemtask.c - + src/sys/init/main.c @@ -55,7 +55,7 @@ biosCall - mpi_message::data + mpi_message::data fclose mpi_message::header taskStruct::id diff --git a/doc/xml/tcpdump_8h.xml b/doc/xml/tcpdump_8h.xml index 64f6bd0..1e7b0a4 100644 --- a/doc/xml/tcpdump_8h.xml +++ b/doc/xml/tcpdump_8h.xml @@ -2,70 +2,18 @@ tcpdump.h - net/pbuf.h - src/sys/net/net/init.c - src/sys/net/netif/loopif.c - src/sys/net/netif/tcpdump.c + net/pbuf.h - - arch/cpu.h - + + net/pbuf.h - - net/arch.h - - - - - - - + src/sys/include/netif/tcpdump.h - + - - net/pbuf.h - - - - - - - - net/debug.h - - - - arch/cc.h - - - - - src/sys/net/netif/tcpdump.c - - - - src/sys/net/netif/loopif.c - - - - src/sys/net/net/init.c - - - - src/sys/include/netif/tcpdump.h - - - - - - - - - void @@ -73,7 +21,7 @@ (struct pbuf *p) tcpdump - struct pbuf * + struct pbuf * p @@ -82,10 +30,7 @@ - - file - NULL - loopif_output + void @@ -101,11 +46,7 @@ - - file - fopen - kpanic - NULL + @@ -150,10 +91,10 @@ #ifndef__NETIF_TCPDUMP_H__ #define__NETIF_TCPDUMP_H__ -#include"net/pbuf.h" +#include"net/pbuf.h" voidtcpdump_init(void); -voidtcpdump(structpbuf*p); +voidtcpdump(structpbuf*p); #endif/*__NETIF_TCPDUMP_H__*/ diff --git a/doc/xml/thread_8c.xml b/doc/xml/thread_8c.xml index 37f6abd..79bd5f7 100644 --- a/doc/xml/thread_8c.xml +++ b/doc/xml/thread_8c.xml @@ -7,156 +7,154 @@ vfs/vfs.h lib/kprintf.h - + sys/thread.h - + - + ubixos/kpanic.h - + ubixos/sched.h - + - + - + - + - + - + - + ubixos/types.h - + - + sys/_types.h - + vfs/file.h - + - + - + - + sys/tss.h - + - + mpi/mpi.h - + - + - + vfs/vfs.h - + - + - + - + - + - + vfs/mount.h - - - + - + lib/kprintf.h - + - + ubixfs/ubixfs.h - + - + - + - + - + - + ubixfs/dirCache.h - + - + src/sys/ubixfs/thread.c - + - + - + - + - + sys/sysproto.h - + - + - + ubixos/elf.h - + - + sys/signal.h - + - + ubixos/tty.h - + - + sys/device.h - + @@ -182,7 +180,7 @@ kprintf mpi_createMbox mpi_fetchMessage - ubixFS_Info + ubixFS_Info @@ -199,9 +197,9 @@ - - struct @15 - struct @15 ubixFS_Info + + struct @9 + struct @9 ubixFS_Info ubixFS_Info @@ -255,12 +253,12 @@ staticstruct{ intmounts; -}ubixFS_Info; +}ubixFS_Info; voidubixfs_thread(structvfs_mountPoint*mp){ mpi_message_tmyMsg; -ubixFS_Info.mounts=0; +ubixFS_Info.mounts=0; if(mp==0x0) kpanic("bah"); diff --git a/doc/xml/thread_8h.xml b/doc/xml/thread_8h.xml index 3d5bd4f..85e3f3c 100644 --- a/doc/xml/thread_8h.xml +++ b/doc/xml/thread_8h.xml @@ -18,747 +18,645 @@ src/sys/kernel/kern_sysctl.c src/sys/kernel/pipe.c - + src/sys/include/sys/thread.h - + - + ubixos/types.h - + - + sys/_types.h - + src/sys/ufs/ffs.c - + src/sys/include/ufs/ufs.h - + - + - + - + src/sys/include/sys/thread.h - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + src/sys/include/ubixos/sched.h - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - + - + src/sys/pci/hd.c - - src/sys/net/netif/tcpdump.c - - - + src/sys/include/ufs/ffs.h - + - + - + src/sys/include/ubixos/endtask.h - + - + - + - + - + - + - + - + - - - + - - src/sys/net/net/sys_arch.c - - - + src/sys/kernel/vitals.c - - src/sys/include/devfs/devfs.h - - - - - - - - - - - + src/sys/mpi/message.c - + src/sys/kmods/kmod.c - + src/sys/mpi/system.c - + src/sys/kernel/kern_sysctl.c - + src/sys/include/ubixos/vitals.h - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + src/sys/kernel/pipe.c - + src/sys/lib/kmalloc.c - + src/sys/vmm/paging.c - + src/sys/ubixfs/directory.c - + src/sys/ufs/ufs.c - + src/sys/kernel/kern_sig.c - + src/sys/kernel/ubthread.c - + src/sys/kernel/systemtask.c - - src/sys/net/netif/ethernetif.c - - - + src/sys/lib/ogprintf.cc - + src/sys/include/vmm/paging.h - + - + - + src/sys/kernel/ld.c - - src/sys/include/vfs/file.h - - - - - - - - - - - - - - - - - - - - - - - + src/sys/include/sys/pipe.h - + - + src/sys/kernel/fork.c - + src/sys/vmm/createvirtualspace.c - + src/sys/vmm/vmm_init.c - - src/sys/net/api/tcpip.c - - - + src/sys/ubixfs/block.c - + src/sys/include/sys/kern_sysctl.h - + - + - + - + src/sys/include/vmm/vmm.h - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + src/sys/kernel/sched.c - - src/sys/net/net/shell.c - - - + src/sys/vmm/setpageattributes.c - + src/sys/include/mpi/mpi.h - + - + - + - + - + - + src/sys/include/sys/gen_calls.h - + - + src/sys/vmm/getphysicaladdr.c - + src/sys/include/ubixos/fork.h - - - + - + src/sys/ubixfs/dirCache.c - + src/sys/ubixfs/ubixfs.c - - src/sys/net/net/init.c - - - + src/sys/include/vfs/vfs.h - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + - - src/sys/include/vfs/mount.h - - - - - - - - - - - - - - - - - - - + src/sys/init/main.c - + src/sys/include/ubixfs/ubixfs.h - + - + - + - + - + - + - + - + - + src/sys/kernel/bioscall.c - + src/sys/include/sys/kern_descrip.h - + - + - + - + - + - + src/sys/include/ubixos/ubthread.h - + - - - + - + src/sys/kernel/syscall.c - + src/sys/include/sys/kern_sig.h - + - + src/sys/isa/ne2k.c - + src/sys/include/ubixos/exec.h - + - + - + - + - + - - - - - + - + src/sys/include/ubixos/syscalls.h - + - + src/sys/include/pci/hd.h - + - + - + src/sys/isa/atkbd.c - + src/sys/vmm/pagefault.c - + src/sys/ubixfs/thread.c - + src/sys/include/ubixos/init.h - - + + - + src/sys/vfs/mount.c - + src/sys/devfs/devfs.c - + src/sys/include/sys/sysproto.h - + - + - + - + - + - + - + - + - + - + - + - + - + src/sys/vmm/unmappage.c - + src/sys/kernel/time.c - + src/sys/vmm/vmm_memory.c - + src/sys/kernel/spinlock.c - + src/sys/kernel/kern_descrip.c - + src/sys/kernel/endtask.c - + src/sys/vfs/file.c - + src/sys/vmm/getfreepage.c - + src/sys/sys/idt.c - + src/sys/kernel/gen_calls.c - + src/sys/kernel/syscall_new.c - + src/sys/kernel/exec.c - + src/sys/include/ubixos/syscalls_new.h - + - + src/sys/include/sys/buf.h - + - - src/sys/isa/fdc.c - - - + src/sys/vmm/getfreevirtualpage.c - + src/sys/vmm/copyvirtualspace.c - + src/sys/vfs/vfs.c @@ -821,7 +719,7 @@ structthread{ inttd_retval[2]; -u_int32_to_files[O_FILES]; +u_int32_to_files[O_FILES]; char*vm_daddr; int32_tvm_dsize; }; diff --git a/doc/xml/time_8c.xml b/doc/xml/time_8c.xml index 742b7e0..f0f04a5 100644 --- a/doc/xml/time_8c.xml +++ b/doc/xml/time_8c.xml @@ -8,163 +8,161 @@ lib/kprintf.h assert.h - + sys/thread.h - + - + ubixos/sched.h - + - + - + - + - + - + - + ubixos/vitals.h - + - + - + - + - + ubixos/types.h - + - + sys/_types.h - + ubixos/time.h - + - + - + vfs/file.h - + - + - + - + sys/tss.h - + - + vfs/vfs.h - + - + - + - + - + - + vfs/mount.h - - - + - + lib/kprintf.h - + - + assert.h - + ubixos/ubthread.h - + - + - + - + ubixfs/dirCache.h - + - + sys/sysproto.h - + - + - + src/sys/kernel/time.c - + - + - + - + - + - + ubixos/elf.h - + - + sys/signal.h - + - + ubixos/tty.h - + - + sys/io.h @@ -192,9 +190,6 @@ timeval::tv_sec timeval::tv_usec - cond_wait - sys_init - sys_unix_now int diff --git a/doc/xml/time_8h.xml b/doc/xml/time_8h.xml index ba3930e..823f054 100644 --- a/doc/xml/time_8h.xml +++ b/doc/xml/time_8h.xml @@ -4,161 +4,155 @@ time.h ubixos/types.h sys/io.h - src/sys/include/ubixos/init.h + src/sys/include/ubixos/init.h src/sys/include/ubixos/ubthread.h src/sys/kernel/syscall.c src/sys/kernel/time.c src/sys/kernel/ubthread.c - + ubixos/types.h - + - + sys/_types.h - + src/sys/include/ubixos/time.h - + - + - + sys/io.h - - src/sys/net/net/sys_arch.c - - - + src/sys/kernel/vitals.c - + src/sys/include/ubixos/vitals.h - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + src/sys/kernel/ubthread.c - + src/sys/kernel/systemtask.c - + src/sys/lib/ogprintf.cc - + src/sys/include/ubixos/time.h - + - + - + - + - + - + src/sys/kernel/fork.c - + src/sys/init/main.c - + src/sys/include/ubixos/ubthread.h - + - - - + - + src/sys/kernel/syscall.c - + src/sys/isa/ne2k.c - + src/sys/isa/atkbd.c - + src/sys/include/ubixos/init.h - - + + - + src/sys/vfs/mount.c - + src/sys/kernel/time.c - + src/sys/vmm/vmm_memory.c - + src/sys/kernel/endtask.c - + src/sys/vfs/file.c - + src/sys/vfs/vfs.c @@ -281,9 +275,6 @@ timeval::tv_sec timeval::tv_usec - cond_wait - sys_init - sys_unix_now int diff --git a/doc/xml/times_8h.xml b/doc/xml/times_8h.xml index bf4a6fc..b994aae 100644 --- a/doc/xml/times_8h.xml +++ b/doc/xml/times_8h.xml @@ -4,39 +4,26 @@ times.h ubixos/types.h sys/_types.h - src/sys/include/net/arch/perf.h - + ubixos/types.h - + - + sys/_types.h - + src/sys/include/ubixos/times.h - + - + - - - src/sys/include/net/arch/perf.h - - - - src/sys/include/ubixos/times.h - - - - - tms diff --git a/doc/xml/trap_8h.xml b/doc/xml/trap_8h.xml index 50a1a3b..7d680dd 100644 --- a/doc/xml/trap_8h.xml +++ b/doc/xml/trap_8h.xml @@ -5,20 +5,20 @@ src/sys/kernel/syscall.c src/sys/kernel/syscall_new.c - + src/sys/kernel/syscall.c - + src/sys/kernel/syscall_new.c - + src/sys/include/sys/trap.h - + - + diff --git a/doc/xml/tss_8h.xml b/doc/xml/tss_8h.xml index 6d6925b..f1df595 100644 --- a/doc/xml/tss_8h.xml +++ b/doc/xml/tss_8h.xml @@ -7,423 +7,387 @@ src/sys/init/main.c src/sys/kernel/bioscall.c - + ubixos/types.h - + - + sys/_types.h - + src/sys/include/sys/tss.h - + - + src/sys/include/ubixos/sched.h - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - + - + src/sys/pci/hd.c - + src/sys/include/ubixos/endtask.h - + - + - + - + - + - + - + - + - - - + - - src/sys/net/net/sys_arch.c - - - + src/sys/kernel/vitals.c - + src/sys/mpi/message.c - + src/sys/kmods/kmod.c - + src/sys/mpi/system.c - + src/sys/kernel/kern_sysctl.c - + src/sys/include/ubixos/vitals.h - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + src/sys/lib/kmalloc.c - + src/sys/vmm/paging.c - + src/sys/ubixfs/directory.c - + src/sys/kernel/kern_sig.c - + src/sys/kernel/ubthread.c - + src/sys/kernel/systemtask.c - - src/sys/net/netif/ethernetif.c - - - + src/sys/lib/ogprintf.cc - + src/sys/kernel/ld.c - + src/sys/kernel/fork.c - + src/sys/include/sys/tss.h - + - + - + - - src/sys/net/api/tcpip.c - - - + src/sys/ubixfs/block.c - + src/sys/kernel/sched.c - - src/sys/net/net/shell.c - - - + src/sys/include/mpi/mpi.h - + - + - + - + - + - + src/sys/include/ubixos/fork.h - - - + - + src/sys/ubixfs/dirCache.c - + src/sys/ubixfs/ubixfs.c - - src/sys/net/net/init.c - - - + src/sys/init/main.c - + src/sys/include/ubixfs/ubixfs.h - + - + - + - + - + - + - + - + - + src/sys/kernel/bioscall.c - + src/sys/include/ubixos/ubthread.h - + - - - + - + src/sys/kernel/syscall.c - + src/sys/isa/ne2k.c - + src/sys/include/ubixos/exec.h - + - + - + - + - + - - - - - + - + src/sys/include/ubixos/syscalls.h - + - + src/sys/include/pci/hd.h - + - + - + src/sys/isa/atkbd.c - + src/sys/vmm/pagefault.c - + src/sys/ubixfs/thread.c - + src/sys/include/ubixos/init.h - - + + - + src/sys/vfs/mount.c - + src/sys/kernel/time.c - + src/sys/vmm/vmm_memory.c - + src/sys/kernel/spinlock.c - + src/sys/kernel/kern_descrip.c - + src/sys/kernel/endtask.c - + src/sys/vfs/file.c - + src/sys/kernel/gen_calls.c - + src/sys/sys/idt.c - + src/sys/kernel/syscall_new.c - + src/sys/kernel/exec.c - + src/sys/vmm/getfreevirtualpage.c - + src/sys/vfs/vfs.c diff --git a/doc/xml/tty_8c.xml b/doc/xml/tty_8c.xml index 0a546ae..c3352a8 100644 --- a/doc/xml/tty_8c.xml +++ b/doc/xml/tty_8c.xml @@ -10,69 +10,69 @@ sys/io.h string.h - + ubixos/kpanic.h - + ubixos/spinlock.h - + - + src/sys/kernel/tty.c - + - + - + - + - + - + - + - + ubixos/types.h - + - + sys/_types.h - + string.h - + - + lib/kmalloc.h - + - + lib/kprintf.h - + - + ubixos/tty.h - + - + sys/io.h diff --git a/doc/xml/tty_8h.xml b/doc/xml/tty_8h.xml index 7049f21..d864096 100644 --- a/doc/xml/tty_8h.xml +++ b/doc/xml/tty_8h.xml @@ -3,7 +3,7 @@ tty.h ubixos/types.h - src/sys/include/ubixos/init.h + src/sys/include/ubixos/init.h src/sys/include/ubixos/sched.h src/sys/isa/atkbd.c src/sys/kernel/fork.c @@ -12,445 +12,409 @@ src/sys/kernel/tty.c src/sys/sys/video.c - + ubixos/types.h - + - + sys/_types.h - + src/sys/include/ubixos/tty.h - + - + src/sys/include/ubixos/sched.h - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - + - + src/sys/pci/hd.c - + src/sys/include/ubixos/endtask.h - + - + - + - + - + - + - + - + - - - + - - src/sys/net/net/sys_arch.c - - - + src/sys/kernel/vitals.c - + src/sys/kernel/tty.c - + src/sys/mpi/message.c - + src/sys/kmods/kmod.c - + src/sys/mpi/system.c - + src/sys/kernel/kern_sysctl.c - + src/sys/include/ubixos/vitals.h - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + src/sys/lib/kmalloc.c - + src/sys/vmm/paging.c - + src/sys/ubixfs/directory.c - + src/sys/kernel/kern_sig.c - + src/sys/kernel/ubthread.c - + src/sys/kernel/systemtask.c - - src/sys/net/netif/ethernetif.c - - - + src/sys/lib/ogprintf.cc - + src/sys/kernel/ld.c - + src/sys/kernel/fork.c - - src/sys/net/api/tcpip.c - - - + src/sys/ubixfs/block.c - + src/sys/kernel/sched.c - - src/sys/net/net/shell.c - - - + src/sys/include/mpi/mpi.h - + - + - + - + - + - + src/sys/include/ubixos/fork.h - - - + - + src/sys/ubixfs/dirCache.c - + src/sys/ubixfs/ubixfs.c - - src/sys/net/net/init.c - - - + src/sys/sys/video.c - + src/sys/init/main.c - + src/sys/include/ubixfs/ubixfs.h - + - + - + - + - + - + - + - + - + src/sys/kernel/bioscall.c - + src/sys/include/ubixos/ubthread.h - + - - - + - + src/sys/kernel/syscall.c - + src/sys/isa/ne2k.c - + src/sys/include/ubixos/exec.h - + - + - + - + - + - - - - - + - + src/sys/include/ubixos/syscalls.h - + - + src/sys/include/pci/hd.h - + - + - + src/sys/isa/atkbd.c - + src/sys/vmm/pagefault.c - + src/sys/ubixfs/thread.c - + src/sys/include/ubixos/init.h - - + + - + src/sys/vfs/mount.c - + src/sys/kernel/kpanic.c - + src/sys/kernel/time.c - + src/sys/vmm/vmm_memory.c - + src/sys/kernel/spinlock.c - + src/sys/kernel/kern_descrip.c - + src/sys/kernel/endtask.c - + src/sys/include/ubixos/tty.h - + - + - + - + - + - + - + - + - + src/sys/vfs/file.c - + src/sys/kernel/gen_calls.c - + src/sys/sys/idt.c - + src/sys/kernel/syscall_new.c - + src/sys/kernel/exec.c - + src/sys/vmm/getfreevirtualpage.c - + src/sys/vfs/vfs.c diff --git a/doc/xml/ubixfs_8c.xml b/doc/xml/ubixfs_8c.xml index e7adb82..6fb5fb7 100644 --- a/doc/xml/ubixfs_8c.xml +++ b/doc/xml/ubixfs_8c.xml @@ -14,194 +14,192 @@ lib/kprintf.h assert.h - + sys/thread.h - + - + ubixos/kpanic.h - + ubixos/sched.h - + - + - + - + - + - + - + ubixos/types.h - + - + sys/_types.h - + lib/string.h - + - + vfs/file.h - + - + - + - + sys/tss.h - + - + lib/kmalloc.h - + - + mpi/mpi.h - + - + - + src/sys/ubixfs/ubixfs.c - + - + - + - + - + - + - + - + - + - + - + - + vfs/vfs.h - + - + - + - + - + - + vfs/mount.h - - - + - + lib/kprintf.h - + - + ubixfs/ubixfs.h - + - + - + - + - + - + assert.h - + ubixfs/dirCache.h - + - + ubixos/exec.h - + - + - + sys/sysproto.h - + - + - + ubixos/elf.h - + - + sys/signal.h - + - + ubixos/tty.h - + - + sys/device.h - + @@ -228,18 +226,18 @@ assert fileDescriptorStruct::cacheNode - vfs_mountPoint::device + vfs_mountPoint::device device_node::devInfo ubixFSInfo::dirCache fileRead fileWrite - vfs_mountPoint::fsInfo + vfs_mountPoint::fsInfo cacheNode::info kmalloc kprintf fileDescriptorStruct::mode fileDescriptorStruct::mp - NULL + NULL cacheNode::permissions fileDescriptorStruct::perms cacheNode::present @@ -283,14 +281,13 @@ assert - buffer fileDescriptorStruct::cacheNode fdEof - vfs_mountPoint::fsInfo + vfs_mountPoint::fsInfo cacheNode::info kpanic fileDescriptorStruct::mp - NULL + NULL cacheNode::present fileDescriptorStruct::size fileDescriptorStruct::status @@ -310,7 +307,7 @@ kpanic - NULL + NULL openFileUbixFS readUbixFS ubixfs_initialize @@ -340,19 +337,19 @@ cacheNode::attributes ubixFSInfo::batEntries ubixFSInfo::blockAllocationTable - vfs_mountPoint::device + vfs_mountPoint::device device_node::devInfo ubixFSInfo::dirCache - vfs_mountPoint::diskLabel - vfs_mountPoint::fsInfo + vfs_mountPoint::diskLabel + vfs_mountPoint::fsInfo cacheNode::info device_interface::info kmalloc kprintf ubixDiskLabel::magicNum ubixDiskLabel::magicNum2 - vfs_mountPoint::partition - ubixDiskLabel::partitions + vfs_mountPoint::partition + ubixDiskLabel::partitions ubixDiskLabel::ubixPartitions::pBatSize cacheNode::permissions cacheNode::present @@ -395,16 +392,16 @@ assert ubixFSInfo::blockAllocationTable blockSize - vfs_mountPoint::device + vfs_mountPoint::device device_node::devInfo - vfs_mountPoint::diskLabel - vfs_mountPoint::fsInfo + vfs_mountPoint::diskLabel + vfs_mountPoint::fsInfo device_interface::info fileDescriptorStruct::mp blockAllocationTableEntry::nextBlock - NULL - vfs_mountPoint::partition - ubixDiskLabel::partitions + NULL + vfs_mountPoint::partition + ubixDiskLabel::partitions device_interface::read blockAllocationTableEntry::realSector UBIXFS_ALIGN @@ -432,16 +429,16 @@ ubixFSInfo::blockAllocationTable - vfs_mountPoint::device + vfs_mountPoint::device device_node::devInfo - vfs_mountPoint::diskLabel + vfs_mountPoint::diskLabel directoryEntry::fileName - vfs_mountPoint::fsInfo + vfs_mountPoint::fsInfo device_interface::info kmalloc kprintf - vfs_mountPoint::partition - ubixDiskLabel::partitions + vfs_mountPoint::partition + ubixDiskLabel::partitions device_interface::read ubixFSInfo::rootDir strcmp @@ -476,15 +473,15 @@ assert ubixFSInfo::blockAllocationTable - vfs_mountPoint::diskLabel + vfs_mountPoint::diskLabel fdOpen fdRead - vfs_mountPoint::fsInfo + vfs_mountPoint::fsInfo fileDescriptorStruct::mp blockAllocationTableEntry::nextBlock - NULL - vfs_mountPoint::partition - ubixDiskLabel::partitions + NULL + vfs_mountPoint::partition + ubixDiskLabel::partitions ubixDiskLabel::ubixPartitions::pBatSize fileDescriptorStruct::start fileDescriptorStruct::status @@ -521,22 +518,22 @@ ubixFSInfo::blockAllocationTable blockSize fileDescriptorStruct::buffer - vfs_mountPoint::device + vfs_mountPoint::device device_node::devInfo - vfs_mountPoint::diskLabel + vfs_mountPoint::diskLabel EOBC fileDescriptorStruct::fileName directoryEntry::fileName - vfs_mountPoint::fsInfo + vfs_mountPoint::fsInfo getFreeBlocks device_interface::info kfree kmalloc fileDescriptorStruct::mp blockAllocationTableEntry::nextBlock - NULL - vfs_mountPoint::partition - ubixDiskLabel::partitions + NULL + vfs_mountPoint::partition + ubixDiskLabel::partitions device_interface::read blockAllocationTableEntry::realSector directoryEntry::size @@ -603,7 +600,7 @@ staticintopenFileUbixFS(constchar*file,fileDescriptor*fd){ //intx=0; /*mjistructdirectoryEntry*dirEntry=(structdirectoryEntry*)kmalloc(0x4000);*/ -structcacheNode*cacheNode=NULL; +structcacheNode*cacheNode=NULL; //structdirectoryEntry*dirEntry=NULL; structubixFSInfo*fsInfo=fd->mp->fsInfo; @@ -624,10 +621,10 @@ if((fd->mode&fileRead)==fileRead){ do{ cacheNode=ubixfs_cacheFind(fsInfo->dirCache,(char*)file); -if(cacheNode==NULL)return0; +if(cacheNode==NULL)return0; if(cacheNode->present==1)break; assert(cacheNode->size); -if(*cacheNode->size!=0&&cacheNode->info==NULL){ +if(*cacheNode->size!=0&&cacheNode->info==NULL){ //kprintf("cachingname(size):%s(%d)\n",cacheNode->name,*cacheNode->size); cacheNode->info=kmalloc(UBIXFS_ALIGN(*cacheNode->size)); fd->size=*cacheNode->size; @@ -641,7 +638,7 @@ }while(1); assert(cacheNode); -if(cacheNode==NULL)return0;/*thisshouldbecaughtabove*/ +if(cacheNode==NULL)return0;/*thisshouldbecaughtabove*/ fd->start=*cacheNode->startCluster; fd->size=*cacheNode->size; @@ -677,7 +674,7 @@ intblockCount=0x0,batIndex=0x0,batIndexPrev=0x0; uInt32i=0x0; structdirectoryEntry*dirEntry=0x0; -structubixFSInfo*fsInfo=NULL; +structubixFSInfo*fsInfo=NULL; assert(fd); assert(fd->mp); @@ -690,7 +687,7 @@ blockCount=(offset/4096); /*FindTheBlockIfItDoesn'tExistWeWillHaveToAllocateOne*/ -for(i=0x0;i<=fd->mp->diskLabel->partitions[fd->mp->partition].pBatSize; +for(i=0x0;i<=fd->mp->diskLabel->partitions[fd->mp->partition].pBatSize; i++){ batIndex=fsInfo->blockAllocationTable[batIndexPrev].nextBlock; if(batIndex==0x0){ @@ -750,8 +747,8 @@ intreadUbixFS(fileDescriptor*fd,char*data,uInt32offset,longsize){ inti=0x0; -char*buffer=0x0; -structubixFSInfo*fsInfo=NULL; +char*buffer=0x0; +structubixFSInfo*fsInfo=NULL; assert(fd); assert(fd->mp); @@ -791,7 +788,7 @@ uInt32blockIndex; uInt32blockIndexPrev; uInt32i=0x0; -structubixFSInfo*fsInfo=NULL; +structubixFSInfo*fsInfo=NULL; structdirectoryEntry*dirEntry=0x0; assert(fd); @@ -818,7 +815,7 @@ } } -fd->mp->device->devInfo->read(fd->mp->device->devInfo->info,fd->buffer,fd->mp->diskLabel->partitions[fd->mp->partition].pOffset+fsInfo->blockAllocationTable[blockIndex].realSector,blockSize); +fd->mp->device->devInfo->read(fd->mp->device->devInfo->info,fd->buffer,fd->mp->diskLabel->partitions[fd->mp->partition].pOffset+fsInfo->blockAllocationTable[blockIndex].realSector,blockSize); for(i=0x0;i<(uInt32)size;i++){ fd->buffer[(offset-(blockOffset*0x1000))]=data[i]; @@ -826,7 +823,7 @@ if(offset%4096==0x0){ blockOffset++; -fd->mp->device->devInfo->write(fd->mp->device->devInfo->info,fd->buffer,fd->mp->diskLabel->partitions[fd->mp->partition].pOffset+fsInfo->blockAllocationTable[blockIndex].realSector,blockSize); +fd->mp->device->devInfo->write(fd->mp->device->devInfo->info,fd->buffer,fd->mp->diskLabel->partitions[fd->mp->partition].pOffset+fsInfo->blockAllocationTable[blockIndex].realSector,blockSize); if(fsInfo->blockAllocationTable[blockIndex].nextBlock==EOBC){ blockIndexPrev=blockIndex; @@ -836,11 +833,11 @@ } else{ blockIndex=fsInfo->blockAllocationTable[blockIndex].nextBlock; -fd->mp->device->devInfo->read(fd->mp->device->devInfo->info,fd->buffer,fd->mp->diskLabel->partitions[fd->mp->partition].pOffset+fsInfo->blockAllocationTable[blockIndex].realSector,blockSize); +fd->mp->device->devInfo->read(fd->mp->device->devInfo->info,fd->buffer,fd->mp->diskLabel->partitions[fd->mp->partition].pOffset+fsInfo->blockAllocationTable[blockIndex].realSector,blockSize); } } } -fd->mp->device->devInfo->write(fd->mp->device->devInfo->info,fd->buffer,fd->mp->diskLabel->partitions[fd->mp->partition].pOffset+fsInfo->blockAllocationTable[blockIndex].realSector,blockSize); +fd->mp->device->devInfo->write(fd->mp->device->devInfo->info,fd->buffer,fd->mp->diskLabel->partitions[fd->mp->partition].pOffset+fsInfo->blockAllocationTable[blockIndex].realSector,blockSize); if((uInt32)offset>fd->size){ fd->size=offset; @@ -868,13 +865,13 @@ structdirectoryEntry*dirEntry=(structdirectoryEntry*)kmalloc(0x1000); structubixFSInfo*fsInfo=mp->fsInfo; -mp->device->devInfo->read(mp->device->devInfo->info,dirEntry,(mp->diskLabel->partitions[mp->partition].pOffset+fsInfo->blockAllocationTable[fsInfo->rootDir].realSector),8); +mp->device->devInfo->read(mp->device->devInfo->info,dirEntry,(mp->diskLabel->partitions[mp->partition].pOffset+fsInfo->blockAllocationTable[fsInfo->rootDir].realSector),8); for(x=0;(uInt32)x<(4096/sizeof(structdirectoryEntry));x++){ if((int)!strcmp(dirEntry[x].fileName,path)){ dirEntry[x].attributes|=typeDeleted; dirEntry[x].fileName[0]='?'; -mp->device->devInfo->write(mp->device->devInfo->info,dirEntry,(mp->diskLabel->partitions[mp->partition].pOffset+fsInfo->blockAllocationTable[fsInfo->rootDir].realSector),8); +mp->device->devInfo->write(mp->device->devInfo->info,dirEntry,(mp->diskLabel->partitions[mp->partition].pOffset+fsInfo->blockAllocationTable[fsInfo->rootDir].realSector),8); return; } } @@ -898,7 +895,7 @@ staticintubixfs_loadData(fileDescriptor*fd,char*data,uInt32size,uInt32batIndex){ uInt32i=0x0; -structubixFSInfo*fsInfo=NULL; +structubixFSInfo*fsInfo=NULL; assert(fd); assert(fd->mp); @@ -914,7 +911,7 @@ if(i!=0x0) batIndex=fsInfo->blockAllocationTable[batIndex].nextBlock; /*Readdatainfrommedia*/ -fd->mp->device->devInfo->read(fd->mp->device->devInfo->info,data+i,fd->mp->diskLabel->partitions[fd->mp->partition].pOffset+fsInfo->blockAllocationTable[batIndex].realSector,blockSize); +fd->mp->device->devInfo->read(fd->mp->device->devInfo->info,data+i,fd->mp->diskLabel->partitions[fd->mp->partition].pOffset+fsInfo->blockAllocationTable[batIndex].realSector,blockSize); } /*Return*/ return(0x0); @@ -935,7 +932,7 @@ assert(mp); assert(mp->diskLabel); -assert(mp->diskLabel->partitions); +assert(mp->diskLabel->partitions); mp->fsInfo=(structubixFSInfo*)kmalloc(sizeof(structubixFSInfo)); assert(mp->fsInfo); @@ -949,18 +946,18 @@ if((mp->diskLabel->magicNum==UBIXDISKMAGIC)&&(mp->diskLabel->magicNum2==UBIXDISKMAGIC)){ /*AllocatememoryforBAT*/ -fsInfo->blockAllocationTable=(structblockAllocationTableEntry*)kmalloc(mp->diskLabel->partitions[mp->partition].pBatSize*512); +fsInfo->blockAllocationTable=(structblockAllocationTableEntry*)kmalloc(mp->diskLabel->partitions[mp->partition].pBatSize*512); assert(fsInfo->blockAllocationTable); /*SetuptheamountofBATentries*/ -fsInfo->batEntries=(mp->diskLabel->partitions[mp->partition].pBatSize*512)/sizeof(structblockAllocationTableEntry); +fsInfo->batEntries=(mp->diskLabel->partitions[mp->partition].pBatSize*512)/sizeof(structblockAllocationTableEntry); /*ReadtheBATtomemory*/ assert(mp->device->devInfo->read); mp->device->devInfo->read(mp->device->devInfo->info, fsInfo->blockAllocationTable, -mp->diskLabel->partitions[mp->partition].pOffset, -mp->diskLabel->partitions[mp->partition].pBatSize); +mp->diskLabel->partitions[mp->partition].pOffset, +mp->diskLabel->partitions[mp->partition].pBatSize); /*Setuprootdirectorycache*/ fsInfo->dirCache=ubixfs_cacheNew("/"); @@ -979,7 +976,7 @@ /*Readrootdirinfromdiskitisalways0x4000byteslong*/ mp->device->devInfo->read(mp->device->devInfo->info, fsInfo->dirCache->info, -(mp->diskLabel->partitions[mp->partition].pOffset+fsInfo->blockAllocationTable[fsInfo->rootDir].realSector), +(mp->diskLabel->partitions[mp->partition].pOffset+fsInfo->blockAllocationTable[fsInfo->rootDir].realSector), 0x4000/512); /*Startourubixfs_threadtomanagethemountpoint*/ @@ -988,7 +985,7 @@ execThread(ubixfs_Thread,(uInt32)(kmalloc(0x2000)+0x2000),0x0); */ kprintf("Offset:[%i],Partition:[%i]\n", -mp->diskLabel->partitions[mp->partition].pOffset,mp->partition); +mp->diskLabel->partitions[mp->partition].pOffset,mp->partition); kprintf("UbixFSInitialized\n"); return(0x1); } @@ -1013,8 +1010,8 @@ intubixfs_init(){ /*Setupourfilesystemstructure*/ structfileSystemubixFileSystem= -{NULL,/*prev*/ -NULL,/*next*/ +{NULL,/*prev*/ +NULL,/*next*/ (void*)ubixfs_initialize,/*vfsInitFS*/ (void*)readUbixFS,/*vfsRead*/ (void*)writeUbixFS,/*vfsWrite*/ diff --git a/doc/xml/ubthread_8c.xml b/doc/xml/ubthread_8c.xml index 5581d3f..7475e88 100644 --- a/doc/xml/ubthread_8c.xml +++ b/doc/xml/ubthread_8c.xml @@ -11,185 +11,183 @@ lib/kmalloc.h lib/kprintf.h - + sys/thread.h - + - + ubixos/sched.h - + - + - + - + - + - + - + ubixos/spinlock.h - + - + ubixos/vitals.h - + - + - + - + - + src/sys/kernel/ubthread.c - + - + - + - + - + - + - + - + - + ubixos/types.h - + - + sys/_types.h - + ubixos/time.h - + - + - + vfs/file.h - + - + - + - + sys/tss.h - + - + lib/kmalloc.h - + - + vfs/vfs.h - + - + - + - + - + - + vfs/mount.h - - - + - + lib/kprintf.h - + - + ubixos/ubthread.h - + - + - + - + ubixfs/dirCache.h - + - + ubixos/exec.h - + - + - + sys/sysproto.h - + - + - + ubixos/elf.h - + - + sys/signal.h - + - + ubixos/tty.h - + - + sys/io.h @@ -212,7 +210,6 @@ kfree - sys_sem_free_ int @@ -238,7 +235,6 @@ kmalloc ubthread_cond::locked UNLOCKED - sys_sem_new_ int @@ -258,7 +254,6 @@ ubthread_cond::locked UNLOCKED - sys_sem_signal int @@ -291,7 +286,6 @@ systemVitals vitalsStruct::sysUptime UNLOCKED - cond_wait int @@ -319,7 +313,6 @@ mutex sched_yield UNLOCKED - cond_wait int @@ -352,7 +345,6 @@ execThread kmalloc x2000 - sys_thread_new int @@ -372,7 +364,6 @@ kfree mutex - sys_sem_free_ int @@ -399,7 +390,6 @@ ubthread_mutex::locked mutex UNLOCKED - sys_sem_new_ int @@ -424,8 +414,6 @@ ubthread_mutex::locked mutex ubthread_mutex::pid - sys_arch_sem_wait - sys_sem_signal int @@ -449,8 +437,6 @@ mutex ubthread_mutex::pid UNLOCKED - sys_arch_sem_wait - sys_sem_signal kTask_t * @@ -465,7 +451,6 @@ _current - current_thread @@ -496,7 +481,6 @@ - cond_wait ubthread_cond_timedwait ubthread_cond_wait ubthread_mutex_destroy diff --git a/doc/xml/ubthread_8h.xml b/doc/xml/ubthread_8h.xml index 9edfbd8..5f876b0 100644 --- a/doc/xml/ubthread_8h.xml +++ b/doc/xml/ubthread_8h.xml @@ -7,245 +7,208 @@ ubixos/time.h src/sys/include/ubixos/vitals.h src/sys/kernel/ubthread.c - src/sys/net/net/sys_arch.c - + sys/thread.h - + - + ubixos/sched.h - + - + - + - + - + - + - + ubixos/types.h - + - + sys/_types.h - + ubixos/time.h - + - + - + vfs/file.h - + - + - + - + sys/tss.h - + - - vfs/vfs.h - - - - - - - - - - - - - + vfs/mount.h - - - + - + src/sys/include/ubixos/ubthread.h - + - + - + - + ubixfs/dirCache.h - + - - sys/sysproto.h - - - - - - - + ubixos/elf.h - + - - sys/signal.h - - - - - + ubixos/tty.h - + - + sys/io.h - - src/sys/net/net/sys_arch.c - - - + src/sys/kernel/vitals.c - + src/sys/include/ubixos/vitals.h - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + src/sys/kernel/ubthread.c - + src/sys/kernel/systemtask.c - + src/sys/lib/ogprintf.cc - + src/sys/kernel/fork.c - + src/sys/init/main.c - + src/sys/include/ubixos/ubthread.h - + - - - + - + src/sys/kernel/syscall.c - + src/sys/isa/ne2k.c - + src/sys/isa/atkbd.c - + src/sys/include/ubixos/init.h - - + + - + src/sys/vfs/mount.c - + src/sys/kernel/time.c - + src/sys/vmm/vmm_memory.c - + src/sys/kernel/endtask.c - + src/sys/vfs/file.c - + src/sys/vfs/vfs.c @@ -267,7 +230,6 @@ - cond_wait LOCKED @@ -359,7 +321,6 @@ kfree - sys_sem_free_ int @@ -385,7 +346,6 @@ kmalloc ubthread_cond::locked UNLOCKED - sys_sem_new_ int @@ -405,7 +365,6 @@ ubthread_cond::locked UNLOCKED - sys_sem_signal int @@ -438,7 +397,6 @@ systemVitals vitalsStruct::sysUptime UNLOCKED - cond_wait int @@ -466,7 +424,6 @@ mutex sched_yield UNLOCKED - cond_wait int @@ -499,7 +456,6 @@ execThread kmalloc x2000 - sys_thread_new int @@ -519,7 +475,6 @@ kfree mutex - sys_sem_free_ int @@ -546,7 +501,6 @@ ubthread_mutex::locked mutex UNLOCKED - sys_sem_new_ int @@ -571,8 +525,6 @@ LOCKED mutex ubthread_mutex::pid - sys_arch_sem_wait - sys_sem_signal int @@ -596,8 +548,6 @@ mutex ubthread_mutex::pid UNLOCKED - sys_arch_sem_wait - sys_sem_signal kTask_t * @@ -612,7 +562,6 @@ _current - current_thread diff --git a/doc/xml/ufs_8c.xml b/doc/xml/ufs_8c.xml index a8e817d..cb3fec8 100644 --- a/doc/xml/ufs_8c.xml +++ b/doc/xml/ufs_8c.xml @@ -10,138 +10,136 @@ ubixos/kpanic.h lib/string.h - + ufs/ufs.h - + - + - + - + sys/thread.h - + - + ubixos/kpanic.h - + ufs/ffs.h - + - + - + - + src/sys/ufs/ufs.c - + - + - + - + - + - + - + - + ubixos/types.h - + - + sys/_types.h - + lib/string.h - + - + vfs/file.h - + - + - + - + lib/kmalloc.h - + - + vfs/vfs.h - + - + - + - + - + - + vfs/mount.h - - - + - + lib/kprintf.h - + - + ubixfs/dirCache.h - + - + sys/sysproto.h - + - + - + sys/signal.h - + - + sys/device.h - + @@ -303,7 +301,7 @@ - vfs_mountPoint::device + vfs_mountPoint::device device_node::devInfo device_interface::info fileDescriptorStruct::mp @@ -335,7 +333,7 @@ dirent::d_fileno - dirent::d_name + dirent::d_name dirent::d_reclen dirent::d_type DEV_BSIZE @@ -372,13 +370,13 @@ - dmadat::blkbuf + dmadat::blkbuf blkoff DBPERVBLK DEV_BSHIFT DEV_BSIZE - ufs2_dinode::di_db - ufs2_dinode::di_ib + ufs2_dinode::di_db + ufs2_dinode::di_ib ufs2_dinode::di_size DIP fileDescriptorStruct::dmadat @@ -388,7 +386,7 @@ FS_UFS1_MAGIC FS_UFS2_MAGIC fsbtodb - dmadat::indbuf + dmadat::indbuf INDIRPERVBLK INO_TO_VBA INO_TO_VBO @@ -400,7 +398,7 @@ NDADDR NINDIR fileDescriptorStruct::offset - dmadat::sbbuf + dmadat::sbbuf sblksize sblock_try fileDescriptorStruct::size @@ -454,7 +452,7 @@ kpanic - NULL + NULL ufs_initialize ufs_openFile ufs_readFile @@ -691,9 +689,9 @@ u_intu; -blkbuf=fd->dmadat->blkbuf; -indbuf=fd->dmadat->indbuf; -fs=(structfs*)fd->dmadat->sbbuf; +blkbuf=fd->dmadat->blkbuf; +indbuf=fd->dmadat->indbuf; +fs=(structfs*)fd->dmadat->sbbuf; if(!fd->dsk_meta){ inomap=0; @@ -760,10 +758,10 @@ lbn=lblkno(fs,fd->offset); off=blkoff(fs,fd->offset); if(lbn<NDADDR){ -addr=DIP(di_db[lbn]); +addr=DIP(di_db[lbn]); }elseif(lbn<NDADDR+NINDIR(fs)){ n=INDIRPERVBLK(fs); -addr=DIP(di_ib[0]); +addr=DIP(di_ib[0]); u=(u_int)(lbn-NDADDR)/(n*DBPERVBLK); vbaddr=fsbtodb(fs,addr)+u; if(indmap!=vbaddr){ @@ -819,7 +817,7 @@ while((n=fsread(*ino,buf,DEV_BSIZE,fd))>0) for(s=buf;s<buf+DEV_BSIZE;){ d=(void*)s; -if(!strcmp(name,d->d_name)){ +if(!strcmp(name,d->d_name)){ *ino=d->d_fileno; returnd->d_type; } @@ -912,8 +910,8 @@ intufs_init(){ /*Buildourufsstruct*/ structfileSystemufs= -{NULL,/*prev*/ -NULL,/*next*/ +{NULL,/*prev*/ +NULL,/*next*/ (void*)ufs_initialize,/*vfsInitFS*/ (void*)ufs_readFile,/*vfsRead*/ (void*)ufs_writeFile,/*vfsWrite*/ diff --git a/doc/xml/ufs_8h.xml b/doc/xml/ufs_8h.xml index 762e46f..316a0fc 100644 --- a/doc/xml/ufs_8h.xml +++ b/doc/xml/ufs_8h.xml @@ -5,122 +5,120 @@ ubixos/types.h vfs/vfs.h sys/device.h - src/sys/include/ubixos/init.h + src/sys/include/ubixos/init.h src/sys/ufs/ffs.c src/sys/ufs/ufs.c - + src/sys/include/ufs/ufs.h - + - + - + - + sys/thread.h - + - + ubixos/types.h - + - + sys/_types.h - + vfs/file.h - + - + - + - + vfs/vfs.h - + - + - + - + - + - + vfs/mount.h - - - + - + ubixfs/dirCache.h - + - + sys/sysproto.h - + - + - + sys/signal.h - + - + sys/device.h - + - + src/sys/ufs/ffs.c - + src/sys/include/ufs/ufs.h - + - + - + - + src/sys/ufs/ufs.c - + src/sys/init/main.c - + src/sys/include/ubixos/init.h - - + + @@ -686,7 +684,7 @@ kpanic - NULL + NULL ufs_initialize ufs_openFile ufs_readFile @@ -830,7 +828,7 @@ __uint16_td_reclen;/*lengthofthisrecord*/ __uint8_td_type;/*filetype,seebelow*/ __uint8_td_namlen;/*lengthofstringind_name*/ -chard_name[MAXNAMLEN+1];/*namemustbenolongerthanthis*/ +chard_name[MAXNAMLEN+1];/*namemustbenolongerthanthis*/ }; #defineNXADDR2/*Externaladdressesininode.*/ @@ -857,9 +855,9 @@ u_int32_tdi_kernflags;/*84:Kernelflags.*/ u_int32_tdi_flags;/*88:Statusflags(chflags).*/ int32_tdi_extsize;/*92:Externalattributesblock.*/ -ufs2_daddr_tdi_extb[NXADDR];/*96:Externalattributesblock.*/ -ufs2_daddr_tdi_db[NDADDR];/*112:Directdiskblocks.*/ -ufs2_daddr_tdi_ib[NIADDR];/*208:Indirectdiskblocks.*/ +ufs2_daddr_tdi_extb[NXADDR];/*96:Externalattributesblock.*/ +ufs2_daddr_tdi_db[NDADDR];/*112:Directdiskblocks.*/ +ufs2_daddr_tdi_ib[NIADDR];/*208:Indirectdiskblocks.*/ int64_tdi_spare[3];/*232:Reserved;currentlyunused*/ }; @@ -868,7 +866,7 @@ int16_tdi_nlink;/*2:Filelinkcount.*/ union{ u_int16_toldids[2];/*4:Ffs:olduserandgroupids.*/ -}di_u; +}di_u; u_int64_tdi_size;/*8:Filebytecount.*/ int32_tdi_atime;/*16:Lastaccesstime.*/ int32_tdi_atimensec;/*20:Lastaccesstime.*/ @@ -876,8 +874,8 @@ int32_tdi_mtimensec;/*28:Lastmodifiedtime.*/ int32_tdi_ctime;/*32:Lastinodechangetime.*/ int32_tdi_ctimensec;/*36:Lastinodechangetime.*/ -ufs1_daddr_tdi_db[NDADDR];/*40:Directdiskblocks.*/ -ufs1_daddr_tdi_ib[NIADDR];/*88:Indirectdiskblocks.*/ +ufs1_daddr_tdi_db[NDADDR];/*40:Directdiskblocks.*/ +ufs1_daddr_tdi_ib[NIADDR];/*88:Indirectdiskblocks.*/ u_int32_tdi_flags;/*100:Statusflags(chflags).*/ int32_tdi_blocks;/*104:Blocksactuallyheld.*/ int32_tdi_gen;/*108:Generationnumber.*/ @@ -963,13 +961,13 @@ int8_tfs_clean;/*filesystemiscleanflag*/ int8_tfs_ronly;/*mountedread-onlyflag*/ int8_tfs_old_flags;/*oldFS_flags*/ -u_charfs_fsmnt[MAXMNTLEN];/*namemountedon*/ -u_charfs_volname[MAXVOLLEN];/*volumename*/ +u_charfs_fsmnt[MAXMNTLEN];/*namemountedon*/ +u_charfs_volname[MAXVOLLEN];/*volumename*/ u_int64_tfs_swuid;/*system-wideuid*/ int32_tfs_pad;/*duetoalignmentoffs_swuid*/ /*thesefieldsretainthecurrentblockallocationinfo*/ int32_tfs_cgrotor;/*lastcgsearched*/ -void*fs_ocsp[NOCSPTRS];/*padding;waslistoffs_csbuffers*/ +void*fs_ocsp[NOCSPTRS];/*padding;waslistoffs_csbuffers*/ u_int8_t*fs_contigdirs;/*(u)#ofcontig.allocateddirs*/ structcsum*fs_csp;/*(u)cgsummaryinfobuffer*/ int32_t*fs_maxcluster;/*(u)maxclusterineachcylgroup*/ @@ -985,7 +983,7 @@ ufs2_daddr_tfs_csaddr;/*blkaddrofcylgrpsummaryarea*/ int64_tfs_pendingblocks;/*(u)blocksbeingfreed*/ int32_tfs_pendinginodes;/*(u)inodesbeingfreed*/ -int32_tfs_snapinum[FSMAXSNAP];/*listofsnapshotinodenumbers*/ +int32_tfs_snapinum[FSMAXSNAP];/*listofsnapshotinodenumbers*/ int32_tfs_avgfilesize;/*expectedaveragefilesize*/ int32_tfs_avgfpdir;/*expected#offilesperdirectory*/ int32_tfs_save_cgsize;/*saverealcgsizetousefs_bsize*/ diff --git a/doc/xml/uniondescriptorTableUnion.xml b/doc/xml/uniondescriptorTableUnion.xml index fa35ed9..24df9ef 100644 --- a/doc/xml/uniondescriptorTableUnion.xml +++ b/doc/xml/uniondescriptorTableUnion.xml @@ -51,21 +51,21 @@ - + gdtDescriptor - + gdtGate - + descriptorTableUnion - + gate - + descriptor diff --git a/doc/xml/unmappage_8c.xml b/doc/xml/unmappage_8c.xml index b909bd9..f289dd9 100644 --- a/doc/xml/unmappage_8c.xml +++ b/doc/xml/unmappage_8c.xml @@ -4,58 +4,58 @@ unmappage.c vmm/vmm.h - + sys/thread.h - + - + ubixos/types.h - + - + sys/_types.h - + vmm/paging.h - + - + - + - + vmm/vmm.h - + - + - + sys/sysproto.h - + - + - + src/sys/vmm/unmappage.c - + - + sys/signal.h - + diff --git a/doc/xml/vfs_8c.xml b/doc/xml/vfs_8c.xml index a5ca529..ef8712c 100644 --- a/doc/xml/vfs_8c.xml +++ b/doc/xml/vfs_8c.xml @@ -9,184 +9,182 @@ lib/string.h sys/kern_descrip.h - + sys/thread.h - + - + ubixos/sched.h - + - + - + - + - + - + - + ubixos/vitals.h - + - + - + - + - + ubixos/types.h - + - + sys/_types.h - + lib/string.h - + - + ubixos/time.h - + - + - + vfs/file.h - + - + - + - + sys/tss.h - + - + lib/kmalloc.h - + - + vfs/vfs.h - + - + - + - + - + - + vfs/mount.h - - - + - + lib/kprintf.h - + - + sys/kern_descrip.h - + - + - + - + ubixos/ubthread.h - + - + - + - + ubixfs/dirCache.h - + - + sys/sysproto.h - + - + - + ubixos/elf.h - + - + sys/signal.h - + - + ubixos/tty.h - + - + sys/io.h - + src/sys/vfs/vfs.c - + - + - + - + - + - + @@ -303,7 +301,7 @@ kprintf memcpy fileSystem::next - NULL + NULL fileSystem::prev systemVitals vfsFindFS @@ -413,7 +411,7 @@ /*AllocateMemory*/ tmpFs=(structfileSystem*)kmalloc(sizeof(structfileSystem)); -if(tmpFs==NULL){ +if(tmpFs==NULL){ kprintf("vfsRegisterFS:memoryallocationfailed\n"); /*MemoryAllocationFailed*/ return(0x1); diff --git a/doc/xml/video_8c.xml b/doc/xml/video_8c.xml index 81edc14..c8e6889 100644 --- a/doc/xml/video_8c.xml +++ b/doc/xml/video_8c.xml @@ -8,49 +8,49 @@ ubixos/spinlock.h ubixos/tty.h - + ubixos/spinlock.h - + - + ubixos/types.h - + - + sys/_types.h - + sys/video.h - + - + src/sys/sys/video.c - + - + - + - + - + - + ubixos/tty.h - + - + sys/io.h @@ -112,7 +112,7 @@ inportByte - NULL + NULL outportByte printColor tty_find @@ -229,7 +229,7 @@ unsignedintbufferOffset=0x0,character=0x0,i=0x0; /*Shortcircuitifwe'reinttymode*/ -if(NULL!=tty_foreground) +if(NULL!=tty_foreground) { tty_print(string,tty_find(0)); return; diff --git a/doc/xml/video_8h.xml b/doc/xml/video_8h.xml index 4f051c3..97fba77 100644 --- a/doc/xml/video_8h.xml +++ b/doc/xml/video_8h.xml @@ -15,91 +15,91 @@ src/sys/pci/lnc.c src/sys/sys/video.c - + ubixos/types.h - + - + sys/_types.h - + src/sys/include/sys/video.h - + - + src/sys/pci/lnc.c - + src/sys/lib/kprintf.c - + src/sys/pci/hd.c - + src/sys/include/sys/video.h - + - + - + - + - + - + - + - + - + - + - + - + src/sys/sys/video.c - + src/sys/init/main.c - + src/sys/kernel/bioscall.c - + src/sys/kernel/syscall.c - + src/sys/isa/atkbd.c - + src/sys/kernel/kpanic.c - + src/sys/lib/libcpp.cc - + src/sys/isa/fdc.c @@ -175,7 +175,7 @@ inportByte - NULL + NULL outportByte printColor tty_find diff --git a/doc/xml/vitals_8c.xml b/doc/xml/vitals_8c.xml index 353fed4..24fe4bb 100644 --- a/doc/xml/vitals_8c.xml +++ b/doc/xml/vitals_8c.xml @@ -8,175 +8,173 @@ lib/kmalloc.h string.h - + sys/thread.h - + - + ubixos/kpanic.h - + ubixos/sched.h - + - + - + - + - + - + - + src/sys/kernel/vitals.c - + - + - + - + - + - + ubixos/vitals.h - + - + - + - + - + ubixos/types.h - + - + sys/_types.h - + string.h - + - + ubixos/time.h - + - + - + vfs/file.h - + - + - + - + sys/tss.h - + - + lib/kmalloc.h - + - + vfs/vfs.h - + - + - + - + - + - + vfs/mount.h - - - + - + lib/kprintf.h - + - + ubixos/ubthread.h - + - + - + - + ubixfs/dirCache.h - + - + sys/sysproto.h - + - + - + ubixos/elf.h - + - + sys/signal.h - + - + ubixos/tty.h - + - + sys/io.h diff --git a/doc/xml/vitals_8h.xml b/doc/xml/vitals_8h.xml index f142804..52700f4 100644 --- a/doc/xml/vitals_8h.xml +++ b/doc/xml/vitals_8h.xml @@ -6,7 +6,7 @@ ubixos/ubthread.h vfs/mount.h vfs/vfs.h - src/sys/include/ubixos/init.h + src/sys/include/ubixos/init.h src/sys/isa/atkbd.c src/sys/isa/ne2k.c src/sys/kernel/endtask.c @@ -22,241 +22,239 @@ src/sys/vfs/vfs.c src/sys/vmm/vmm_memory.c - + sys/thread.h - + - + ubixos/sched.h - + - + - + - + - + - + - + src/sys/include/ubixos/vitals.h - + - + - + - + - + ubixos/types.h - + - + sys/_types.h - + ubixos/time.h - + - + - + vfs/file.h - + - + - + - + sys/tss.h - + - + vfs/vfs.h - + - + - + - + - + - + vfs/mount.h - - - + - + ubixos/ubthread.h - + - + - + - + ubixfs/dirCache.h - + - + sys/sysproto.h - + - + - + ubixos/elf.h - + - + sys/signal.h - + - + ubixos/tty.h - + - + sys/io.h - + src/sys/kernel/vitals.c - + src/sys/include/ubixos/vitals.h - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + src/sys/kernel/ubthread.c - + src/sys/kernel/systemtask.c - + src/sys/lib/ogprintf.cc - + src/sys/kernel/fork.c - + src/sys/init/main.c - + src/sys/kernel/syscall.c - + src/sys/isa/ne2k.c - + src/sys/isa/atkbd.c - + src/sys/include/ubixos/init.h - - + + - + src/sys/vfs/mount.c - + src/sys/kernel/time.c - + src/sys/vmm/vmm_memory.c - + src/sys/kernel/endtask.c - + src/sys/vfs/file.c - + src/sys/vfs/vfs.c diff --git a/doc/xml/vmm_8h.xml b/doc/xml/vmm_8h.xml index 079ea3f..1fb7a1b 100644 --- a/doc/xml/vmm_8h.xml +++ b/doc/xml/vmm_8h.xml @@ -4,7 +4,7 @@ vmm.h vmm/paging.h ubixos/types.h - src/sys/include/ubixos/init.h + src/sys/include/ubixos/init.h src/sys/kernel/bioscall.c src/sys/kernel/endtask.c src/sys/kernel/exec.c @@ -28,201 +28,201 @@ src/sys/vmm/vmm_init.c src/sys/vmm/vmm_memory.c - + sys/thread.h - + - + ubixos/types.h - + - + sys/_types.h - + vmm/paging.h - + - + - + - + src/sys/include/vmm/vmm.h - + - + - + sys/sysproto.h - + - + - + sys/signal.h - + - + src/sys/kmods/kmod.c - + src/sys/lib/kmalloc.c - + src/sys/vmm/paging.c - + src/sys/kernel/systemtask.c - + src/sys/kernel/ld.c - + src/sys/kernel/fork.c - + src/sys/vmm/createvirtualspace.c - + src/sys/vmm/vmm_init.c - + src/sys/kernel/sched.c - + src/sys/include/vmm/vmm.h - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + src/sys/vmm/setpageattributes.c - + src/sys/vmm/getphysicaladdr.c - + src/sys/init/main.c - + src/sys/kernel/bioscall.c - + src/sys/kernel/syscall.c - + src/sys/vmm/pagefault.c - + src/sys/include/ubixos/init.h - - + + - + src/sys/vmm/unmappage.c - + src/sys/vmm/vmm_memory.c - + src/sys/kernel/endtask.c - + src/sys/vmm/getfreepage.c - + src/sys/sys/idt.c - + src/sys/kernel/exec.c - + src/sys/vmm/getfreevirtualpage.c - + src/sys/vmm/copyvirtualspace.c diff --git a/doc/xml/vmm__init_8c.xml b/doc/xml/vmm__init_8c.xml index 1efbcfb..02b9141 100644 --- a/doc/xml/vmm__init_8c.xml +++ b/doc/xml/vmm__init_8c.xml @@ -5,64 +5,64 @@ vmm/vmm.h ubixos/kpanic.h - + sys/thread.h - + - + ubixos/kpanic.h - + ubixos/types.h - + - + sys/_types.h - + vmm/paging.h - + - + - + - + src/sys/vmm/vmm_init.c - + - + - + vmm/vmm.h - + - + - + sys/sysproto.h - + - + - + sys/signal.h - + diff --git a/doc/xml/vmm__memory_8c.xml b/doc/xml/vmm__memory_8c.xml index e1d6c59..3c0c213 100644 --- a/doc/xml/vmm__memory_8c.xml +++ b/doc/xml/vmm__memory_8c.xml @@ -11,203 +11,201 @@ ubixos/spinlock.h assert.h - + sys/thread.h - + - + ubixos/kpanic.h - + ubixos/sched.h - + - + - + - + - + - + - + ubixos/spinlock.h - + - + ubixos/vitals.h - + - + - + - + - + ubixos/types.h - + - + sys/_types.h - + vmm/paging.h - + - + - + - + ubixos/time.h - + - + - + vfs/file.h - + - + - + - + sys/tss.h - + - + lib/kmalloc.h - + - + vmm/vmm.h - + - + - + vfs/vfs.h - + - + - + - + - + - + vfs/mount.h - - - + - + lib/kprintf.h - + - + assert.h - + ubixos/ubthread.h - + - + - + - + ubixfs/dirCache.h - + - + sys/sysproto.h - + - + - + src/sys/vmm/vmm_memory.c - + - + - + - + - + - + - + - + - + ubixos/elf.h - + - + sys/signal.h - + - + ubixos/tty.h - + - + sys/io.h diff --git a/doc/xml/vsprintf_8c.xml b/doc/xml/vsprintf_8c.xml index 47044e6..f61a09d 100644 --- a/doc/xml/vsprintf_8c.xml +++ b/doc/xml/vsprintf_8c.xml @@ -5,32 +5,32 @@ stdarg.h lib/string.h - + stdarg.h - + ubixos/types.h - + - + sys/_types.h - + lib/string.h - + - + src/sys/lib/vsprintf.c - + - + diff --git a/src/bin/edit/main.c b/src/bin/edit/main.c index a48874b..38a1a1a 100644 --- a/src/bin/edit/main.c +++ b/src/bin/edit/main.c @@ -28,8 +28,10 @@ *****************************************************************************************/ #include +#include int main(int argc,char **argv) { + extern char *environ; char in[1024]; FILE *out; size_t count = 0x0; @@ -44,6 +46,10 @@ printf("%c",fgetc(out)); } + printf("\nENV TEST: [0x%X]\n",environ); + setenv("BLAH","WOOT",1); + printf("[%s]",getenv("BLAH")); + return(0); } diff --git a/src/bin/ld/addlibrary.c b/src/bin/ld/addlibrary.c index 367aea6..e527520 100644 --- a/src/bin/ld/addlibrary.c +++ b/src/bin/ld/addlibrary.c @@ -115,6 +115,7 @@ switch (ELF32_R_TYPE(tmpLib->linkerElfRel[x].pltInfo)) { case R_386_32: *reMap += ((uInt32)tmpLib->output + tmpLib->linkerRelSymTab[rel].dynValue); + //printf("[0x%X]",*reMap); break; case R_386_PC32: *reMap += ((uInt32)tmpLib->output + tmpLib->linkerRelSymTab[rel].dynValue) - (uInt32)reMap; diff --git a/src/lib/csu/crt1.c b/src/lib/csu/crt1.c index 1c4423c..6cdb2a8 100644 --- a/src/lib/csu/crt1.c +++ b/src/lib/csu/crt1.c @@ -86,6 +86,7 @@ argc = *(long *)(void *)(argv - 1); env = argv + argc + 1; environ = env; + if (argc > 0 && argv[0] != NULL) { __progname = argv[0]; for (s = __progname; *s != '\0'; s++) diff --git a/src/lib/libc/Makefile.inc b/src/lib/libc/Makefile.inc index 7ef6339..920f631 100644 --- a/src/lib/libc/Makefile.inc +++ b/src/lib/libc/Makefile.inc @@ -1,2 +1,2 @@ INCLUDES = -I../include -I../../../include.new -CFLAGS += -DPORTMAP -D__DBINTERFACE_PRIVATE -nostdinc -DPIC +CFLAGS += -DPORTMAP -D__DBINTERFACE_PRIVATE -nostdinc #-DPIC diff --git a/src/lib/libc/i386/Makefile.inc b/src/lib/libc/i386/Makefile.inc index 55053b0..eeb7ba5 100755 --- a/src/lib/libc/i386/Makefile.inc +++ b/src/lib/libc/i386/Makefile.inc @@ -1,2 +1,2 @@ INCLUDES = -I../../include -I../../../../include.new -CFLAGS += -DPORTMAP -D__DBINTERFACE_PRIVATE -nostdinc -DPIC +CFLAGS += -DPORTMAP -D__DBINTERFACE_PRIVATE -nostdinc #-DPIC diff --git a/src/lib/libc/stdlib/getenv.c b/src/lib/libc/stdlib/getenv.c index b266a53..7c47046 100644 --- a/src/lib/libc/stdlib/getenv.c +++ b/src/lib/libc/stdlib/getenv.c @@ -61,10 +61,8 @@ int len, i; const char *np; char **p, *cp; - - //HACK - return(NULL); - +/* HACK*/ +return(NULL); if (name == NULL || environ == NULL) return (NULL); for (np = name; *np && *np != '='; ++np) diff --git a/src/lib/libc/stdlib/setenv.c b/src/lib/libc/stdlib/setenv.c index d7c0394..90c384a 100644 --- a/src/lib/libc/stdlib/setenv.c +++ b/src/lib/libc/stdlib/setenv.c @@ -58,10 +58,14 @@ static char **alloced; /* if allocated space before */ char *c; int l_value, offset; + char blah[32]; + +__sys_write(1,"setenv",sizeof("setenv")); if (*value == '=') /* no `=' in value */ ++value; l_value = strlen(value); +__sys_write(1,"setenv2",sizeof("setenv2")); if ((c = __findenv(name, &offset))) { /* find if already exists */ if (!rewrite) return (0); @@ -73,8 +77,13 @@ int cnt; char **p; +__sys_write(1,"setenv3",sizeof("setenv3")); +sprintf(blah,"[0x%X]",environ); +__sys_write(1,blah,32); for (p = environ, cnt = 0; *p; ++p, ++cnt); +__sys_write(1,"setenv3.1",sizeof("setenv3.1")); if (alloced == environ) { /* just increase size */ +__sys_write(1,"setenv4",sizeof("setenv4")); p = (char **)realloc((char *)environ, (size_t)(sizeof(char *) * (cnt + 2))); if (!p) @@ -83,6 +92,7 @@ } else { /* get new space */ /* copy old entries into it */ +__sys_write(1,"setenv5",sizeof("setenv5")); p = malloc((size_t)(sizeof(char *) * (cnt + 2))); if (!p) return (-1); diff --git a/src/lib/ubix/sstart.c b/src/lib/ubix/sstart.c index bca8101..93d2bde 100644 --- a/src/lib/ubix/sstart.c +++ b/src/lib/ubix/sstart.c @@ -9,7 +9,10 @@ argv = ≈ argc = *(long *)(void *)(argv - 1); + env = argv + argc + 1; + environ = env; + printf("env[0]: 0x%X\n",env[0]); /* printf("(&ap: 0x%X)\n",&ap); printf("(argv[0]: 0x%X\n",argv[0]); diff --git a/src/sys/include/ubixos/elf.h b/src/sys/include/ubixos/elf.h index 5189948..a84c921 100644 --- a/src/sys/include/ubixos/elf.h +++ b/src/sys/include/ubixos/elf.h @@ -31,6 +31,7 @@ #define _ELF_H #include +#include #define elfExecutable 0x002 #define elfLibrary 0x003 @@ -151,9 +152,22 @@ uInt32 dynPtr; } elfDynamic; +typedef struct { + int32_t execfd; + u_int32_t phdr; + u_int32_t phent; + u_int32_t phnum; + u_int32_t pagesz; + u_int32_t base; + u_int32_t flags; + u_int32_t entry; + u_int32_t trace; +} Elf_Auxargs; + char *elfGetShType(int); char *elfGetPhType(int); char *elfGetRelType(int); +int elf_loadfile(kTask_t *p,const char *file,u_int32_t *addr,u_int32_t *entry); #define ELF32_R_SYM(i) ((i)>>8) #define ELF32_R_TYPE(i) ((unsigned char)(i)) @@ -163,6 +177,9 @@ /*** $Log$ + Revision 1.1.1.1 2006/06/01 12:46:13 reddawg + ubix2 + Revision 1.2 2005/10/12 00:13:37 reddawg Removed diff --git a/src/sys/include/ubixos/exec.h b/src/sys/include/ubixos/exec.h index c17be04..d48d56d 100644 --- a/src/sys/include/ubixos/exec.h +++ b/src/sys/include/ubixos/exec.h @@ -35,23 +35,10 @@ uInt32 execThread(void (* tproc)(void),uInt32,char *); void execFile(char *file,int argc,char **argv,int console); +void sys_exec(char *file,char *ap); #endif /*** - $Log$ - Revision 1.2 2005/10/12 00:13:37 reddawg - Removed - - Revision 1.1.1.1 2005/09/26 17:23:54 reddawg - no message - - Revision 1.5 2004/07/27 07:27:50 reddawg - chg: I was fooled thought we failed but it was a casting issue - - Revision 1.4 2004/05/21 15:20:00 reddawg - Cleaned up - - END ***/ diff --git a/src/sys/include/ubixos/sched.h b/src/sys/include/ubixos/sched.h index 4ed9beb..2bbcc2b 100644 --- a/src/sys/include/ubixos/sched.h +++ b/src/sys/include/ubixos/sched.h @@ -31,7 +31,7 @@ #define _SCHED_H #include -#include +//#include #include #include #include @@ -88,6 +88,9 @@ /*** $Log$ + Revision 1.2 2006/10/27 16:42:42 reddawg + Testing + Revision 1.1.1.1 2006/06/01 12:46:14 reddawg ubix2 diff --git a/src/sys/include/vfs/mount.h b/src/sys/include/vfs/mount.h index b4a8d69..310ce85 100644 --- a/src/sys/include/vfs/mount.h +++ b/src/sys/include/vfs/mount.h @@ -31,7 +31,6 @@ #define _MOUNT_H #include -#include struct vfs_mountPoint { struct vfs_mountPoint *prev; diff --git a/src/sys/isa/8259.c b/src/sys/isa/8259.c index 7b5dbb1..483bd5d 100644 --- a/src/sys/isa/8259.c +++ b/src/sys/isa/8259.c @@ -27,22 +27,18 @@ *****************************************************************************************/ -#include #include -#include +#include #include static unsigned int irqMask = 0xFFFF; -/************************************************************************ - - Function: int 8259_init() - - Description: This function will initialize both PICs for all of our IRQs - - Notes: - -************************************************************************/ +/*! + * \brief initialize the 8259 PIC + * + * This will initialize both PICs for all of our IRQs + * + */ int i8259_init() { outportByte(mPic, icw1); /* Initialize Master PIC */ outportByte(sPic, icw1); /* Initialize Seconary PIC */ @@ -63,16 +59,12 @@ return(0x0); } -/************************************************************************ - - Function: int irqEnable() - - Description: This function is used to turn on an IRQ - - Notes: - -************************************************************************/ -void irqEnable(uInt16 irqNo) { +/*! + * \brief enable specified IRQ + * + * \param irqNo IRQ to enable + */ +void irqEnable(u_int16_t irqNo) { irqMask &= ~(1 << irqNo); if (irqNo >= 8) { irqMask &= ~(1 << 2); @@ -81,16 +73,12 @@ outportByte(sPic+1, (irqMask >> 8) & 0xFF); } -/************************************************************************ - - Function: int irqDisable() - - Description: This function is used to turn off an IRQ - - Notes: - -************************************************************************/ -void irqDisable(uInt16 irqNo) { +/*! + * \brief disable specified IRQ + * + * \param irqNo IRQ to disable + */ +void irqDisable(u_int16_t irqNo) { irqMask |= (1 << irqNo); if ((irqMask & 0xFF00)==0xFF00) { irqMask |= (1 << 2); @@ -100,26 +88,5 @@ } /*** - $Log$ - Revision 1.2 2005/10/12 00:13:37 reddawg - Removed - - Revision 1.1.1.1 2005/09/26 17:23:59 reddawg - no message - - Revision 1.5 2004/07/09 13:20:08 reddawg - Oh yeah duh you can not name functions with numbers - - Revision 1.4 2004/07/09 13:14:29 reddawg - 8259: changed init8259 to 8259_init - Adjusted Startup Routines - - Revision 1.3 2004/05/20 22:51:09 reddawg - Cleaned Up Warnings - - Revision 1.2 2004/05/10 02:23:24 reddawg - Minor Changes To Source Code To Prepare It For Open Source Release - END ***/ - diff --git a/src/sys/kernel/elf.c b/src/sys/kernel/elf.c index 68543a9..20c00f6 100644 --- a/src/sys/kernel/elf.c +++ b/src/sys/kernel/elf.c @@ -28,6 +28,9 @@ *****************************************************************************************/ #include +#include +#include +#include const struct { char *elfTypeName; @@ -41,7 +44,7 @@ { "ET_LOPROC", 0xff00 }, { "ET_HIPROC", 0xffff }, }; - + const struct { char *phTypeName; uInt32 id; @@ -104,7 +107,83 @@ char *elfGetRelType(int relType) { return((char *)elfRelType[relType].relTypeName); } - + +int elf_loadfile(kTask_t *p,const char *file,u_int32_t *addr,u_int32_t *entry) { + int i = 0x0; + int x = 0x0; + int numsegs = 0x0; + u_int32_t base = 0x0; + u_int32_t base_addr = 0x0; + elfHeader *binaryHeader = 0x0; + elfProgramHeader *programHeader = 0x0; + fileDescriptor *exec_fd = 0x0; + + exec_fd = fopen(file,"r"); + if (exec_fd == 0x0) + return(-1); +kprintf("MOO"); + /* Load the ELF header */ + if ((binaryHeader = (elfHeader *)kmalloc(sizeof(elfHeader))) == 0x0) + K_PANIC("malloc failed!"); + fread(binaryHeader,sizeof(elfHeader),1,exec_fd); + + /* Check If App Is A Real Application */ + if ((binaryHeader->eIdent[1] != 'E') && (binaryHeader->eIdent[2] != 'L') && (binaryHeader->eIdent[3] != 'F')) { + kfree(binaryHeader); + fclose(exec_fd); + return(-1); + } + + if (binaryHeader->eType == ET_DYN) + base = *addr; + else if (binaryHeader->eType == ET_EXEC) + base = 0x0; + else + return(-1); + + /* Load The Program Header(s) */ + if ((programHeader = (elfProgramHeader *)kmalloc(sizeof(elfProgramHeader)*binaryHeader->ePhnum)) == 0x0) + K_PANIC("malloc failed!"); + fseek(exec_fd,binaryHeader->ePhoff,0); + fread(programHeader,(sizeof(elfProgramHeader)*binaryHeader->ePhnum),1,exec_fd); +kprintf("MEW: [0x%X]",base); + for (i = 0x0;i < binaryHeader->ePhnum;i++) { + switch (programHeader[i].phType) { + case PT_LOAD: + /* + Allocate Memory Im Going To Have To Make This Load Memory With Correct + Settings so it helps us in the future + */ + for (x = 0x0;x < (programHeader[i].phMemsz);x += 0x1000) { + /* Make readonly and read/write */ + if (vmm_remapPage(vmmFindFreePage(_current->id),((programHeader[i].phVaddr & 0xFFFFF000) + x + base),PAGE_DEFAULT) == 0x0) + K_PANIC("Error: Remap Page Failed"); + memset((void *)((programHeader[i].phVaddr & 0xFFFFF000) + x + base),0x0,0x1000); + } + + /* Now Load Section To Memory */ + fseek(exec_fd,programHeader[i].phOffset,0); + fread((void *)programHeader[i].phVaddr,programHeader[i].phFilesz,1,exec_fd); + + if ((programHeader[i].phFlags & 0x2) != 0x2) { + for (x = 0x0;x < (programHeader[i].phMemsz);x += 0x1000) { + if ((vmm_setPageAttributes((programHeader[i].phVaddr & 0xFFFFF000) + x + base,PAGE_PRESENT | PAGE_USER)) != 0x0) + K_PANIC("vmm_setPageAttributes failed"); + } + } + if (numsegs == 0x0) + base_addr = (programHeader[i].phVaddr & 0xFFFFF000) + base; + numsegs++; + break; + } + } + *addr = base_addr; + kprintf("entry: [0x%X]\n",*entry); + *entry = binaryHeader->eEntry + base; + kprintf("entry: [0x%X]\n",*entry); + return(0x0); + } + /*** END ***/ diff --git a/src/sys/kernel/exec.c b/src/sys/kernel/exec.c index 772f540..fcadb83 100644 --- a/src/sys/kernel/exec.c +++ b/src/sys/kernel/exec.c @@ -15,7 +15,8 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + MERCHANTABILITY AND F +ITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) @@ -28,7 +29,7 @@ *****************************************************************************************/ #include -#include +#include #include #include #include @@ -350,6 +351,12 @@ elfDynamic *elfDynamicS = 0x0; struct i386_frame *iFrame = 0x0; + + if (_current->id > 4) { + sys_exec(file,ap); + return; + } + tmpFd = fopen(file,"r"); _current->imageFd = tmpFd; /* If We Dont Find the File Return */ @@ -479,8 +486,9 @@ */ } } - _current->td.vm_dsize = seg_size >> PAGE_SHIFT; - _current->td.vm_daddr = (char *)seg_addr; + + _current->td.vm_dsize = seg_size >> PAGE_SHIFT; + _current->td.vm_daddr = (char *)seg_addr; argv = ap; @@ -512,7 +520,7 @@ //if (_current->id > 3) { - iFrame->user_esp = ((u_int32_t)STACK_ADDR) - (sizeof(u_int32_t) * (x + 1)); + iFrame->user_esp = ((u_int32_t)STACK_ADDR) - (sizeof(u_int32_t) * (argc + 3)); tmp = iFrame->user_esp; //! build argc and argv[] @@ -520,6 +528,8 @@ for (i = 0;i < argc;i++) { tmp[i + 1] = argv[i]; } + tmp[argc + 1] = 0x0; + tmp[argc + 2] = 0x1; //} //else { //tmp = (u_int32_t *)STACK_ADDR - 2; @@ -535,6 +545,176 @@ return; } +/*! + * \brief New exec... + * + */ +void sys_exec(char *file,char *ap) { + int error = 0x0; + int i = 0x0; + int x = 0x0; + int argc = 0x0; + u_int32_t seg_size = 0x0; + u_int32_t seg_addr = 0x0; + u_int32_t addr = 0x0; + u_int32_t eip = 0x0; + u_int32_t proghdr = 0x0; + char *args = 0x0; + char *interp = 0x0; + char **argv = 0x0; + char **argvNew = 0x0; + elfHeader *binaryHeader = 0x0; + elfProgramHeader *programHeader = 0x0; + struct i386_frame *iFrame = 0x0; + Elf_Auxargs *auxargs = 0x0; + + _current->imageFd = fopen(file,"r"); + if (_current->imageFd == 0x0) + return(-1); + + /* Load the ELF header */ + if ((binaryHeader = (elfHeader *)kmalloc(sizeof(elfHeader))) == 0x0) + K_PANIC("malloc failed!"); + fread(binaryHeader,sizeof(elfHeader),1,_current->imageFd); + + /* Check If App Is A Real Application */ + if (((binaryHeader->eIdent[1] != 'E') && (binaryHeader->eIdent[2] != 'L') && (binaryHeader->eIdent[3] != 'F')) || (binaryHeader->eType != ET_EXEC)) { + kfree(binaryHeader); + fclose(_current->imageFd); + return(-1); + } + + /* Load The Program Header(s) */ + if ((programHeader = (elfProgramHeader *)kmalloc(sizeof(elfProgramHeader)*binaryHeader->ePhnum)) == 0x0) + K_PANIC("malloc failed!"); + fseek(_current->imageFd,binaryHeader->ePhoff,0); + fread(programHeader,(sizeof(elfProgramHeader)*binaryHeader->ePhnum),1,_current->imageFd); + + /* Loop Through The Header And Load Sections Which Need To Be Loaded */ + for (i = 0x0;i < binaryHeader->ePhnum;i++) { + switch (programHeader[i].phType) { + case PT_LOAD: + seg_addr = trunc_page(programHeader[i].phVaddr); + seg_size = round_page(programHeader[i].phMemsz + programHeader[i].phVaddr - seg_addr); + + /* + Allocate Memory Im Going To Have To Make This Load Memory With Correct + Settings so it helps us in the future + */ + for (x = 0x0;x < (programHeader[i].phMemsz);x += 0x1000) { + /* Make readonly and read/write !!! */ + if (vmm_remapPage(vmmFindFreePage(_current->id),((programHeader[i].phVaddr & 0xFFFFF000) + x),PAGE_DEFAULT) == 0x0) + K_PANIC("Error: Remap Page Failed"); + memset((void *)((programHeader[i].phVaddr & 0xFFFFF000) + x),0x0,0x1000); + } + + /* Now Load Section To Memory */ + fseek(_current->imageFd,programHeader[i].phOffset,0); + fread((void *)programHeader[i].phVaddr,programHeader[i].phFilesz,1,_current->imageFd); + if ((programHeader[i].phFlags & 0x2) != 0x2) { + for (x = 0x0;x < (programHeader[i].phMemsz);x += 0x1000) { + if ((vmm_setPageAttributes((programHeader[i].phVaddr & 0xFFFFF000) + x,PAGE_PRESENT | PAGE_USER)) != 0x0) + K_PANIC("vmm_setPageAttributes failed"); + } + } + if (binaryHeader->eEntry >= programHeader[i].phVaddr && binaryHeader->eEntry < (programHeader[i].phVaddr + programHeader[i].phMemsz)) { + /* We're suposed to do something here? */ + } + else { + _current->td.vm_dsize = seg_size >> PAGE_SHIFT; + _current->td.vm_daddr = (char *)seg_addr; + } + + _current->oInfo.vmStart = ((programHeader[i].phVaddr & 0xFFFFF000) + 0xA900000); + break; + case PT_INTERP: + interp = (char *)kmalloc(programHeader[i].phFilesz); + if (interp == 0x0) + K_PANIC("malloc failed"); + + fseek(_current->imageFd,programHeader[i].phOffset,0); + fread((void *)interp,programHeader[i].phFilesz,1,_current->imageFd); + kprintf("Interp: [%s]\n",interp); + //ldAddr = ldEnable(); + break; + case PT_PHDR: + proghdr = programHeader[i].phVaddr; + break; + default: + break; + } + } + + addr = LD_START; + + + if (interp != 0x0) { + kprintf("TEST"); + elf_loadfile(_current,interp,&addr,&eip); + } + kprintf("[0x%X][0x%X]\n",eip,addr); + + _current->td.vm_dsize = seg_size >> PAGE_SHIFT; + _current->td.vm_daddr = (char *)seg_addr; + + argv = ap; + + if (argv[1] != 0x0) { + argc = argv[0]; + args = (char *)vmmGetFreeVirtualPage(_current->id,1,VM_TASK); + memset(args,0x0,0x1000); + x = 0x0; + argvNew = (char **)kmalloc(sizeof(char *) * argc); + for (i = 0x0;i < argc;i++) { + strcpy(args + x,argv[i + 1]); + argvNew[i] = args + x; + x += strlen(argv[i + 1]) + 1; + } + argv = argvNew; + } + + //! Clean the virtual of COW pages left over from the fork + vmm_cleanVirtualSpace(_current->td.vm_daddr + (_current->td.vm_dsize << PAGE_SIZE)); + + + //! Adjust iframe + iFrame = _current->tss.esp0 - sizeof(struct i386_frame); + iFrame->ebp = STACK_ADDR; + iFrame->eip = eip; + + //if (_current->id > 3) { + + iFrame->user_esp = ((u_int32_t)STACK_ADDR) - (sizeof(u_int32_t) * (argc + 3 + sizeof(Elf_Auxargs))); + args = iFrame->user_esp; + + //! build argc and argv[] + args[0] = argc; + for (i = 0;i < argc;i++) { + args[i + 1] = argv[i]; + } + //! Start of Env + args[argc + 2] = 0x0; + auxargs = iFrame->user_esp + argc + 2; + auxargs->execfd = -1; + auxargs->phdr = proghdr; + auxargs->phent = binaryHeader->ePhentsize; + auxargs->phnum = binaryHeader->ePhnum; + auxargs->pagesz = PAGE_SIZE; + auxargs->base = addr; + auxargs->flags = 0x0; + auxargs->entry = binaryHeader->eEntry; + auxargs->trace = 0x0; +kprintf("\n\nDOH\n\n"); + + //while (1); +/* + error = elf_loadfile(_current,file,0x0,0x0); + if (error) + K_PANIC("elf_loadfile failed"); +*/ + return; + } + /*** END ***/ diff --git a/ubix2.kdevelop b/ubix2.kdevelop index 0ba277f..05ec39d 100644 --- a/ubix2.kdevelop +++ b/ubix2.kdevelop @@ -15,7 +15,7 @@ kdevcvsservice . false - + @@ -34,27 +34,27 @@ make - + true 1 false - + 0 - - + + default executable / - - + + false true @@ -147,10 +147,10 @@ false 3 - + - + set m_,_ theValue @@ -190,12 +190,12 @@ - - - - - - + + + + + + true false false diff --git a/ubix2.kdevses b/ubix2.kdevses index f6e6542..bb9a656 100644 --- a/ubix2.kdevses +++ b/ubix2.kdevses @@ -1,22 +1,31 @@ - + - + - + - + - + - - + + + + + + + + + + +

Defines


Functions
char * phTypeName
}	elfPhType []
}	elfPhType []
struct {
char * relTypeName
}	elfRelType []
}	elfRelType []
struct {
char * shTypeName
}	elfShType []
}	elfShType []
struct {
uInt32 id
}	elfType []
}	elfType []

src/sys/Makefile.inc [code]
src/sys/compile/null.c [code]
src/sys/devfs/devfs.c [code]
src/sys/include/assert.h [code]
src/sys/include/math.h [code]
src/sys/include/lib/libcpp.h [code]
src/sys/include/lib/string.h [code]
src/sys/include/mpi/mpi.h [code]
src/sys/include/net/api.h [code]
src/sys/include/net/api_msg.h [code]
src/sys/include/net/arch.h [code]
src/sys/include/net/debug.h [code]
src/sys/include/net/def.h [code]
src/sys/include/net/err.h [code]
src/sys/include/net/list.h [code]
src/sys/include/net/lwipopts.h [code]
src/sys/include/net/mem.h [code]
src/sys/include/net/memp.h [code]
src/sys/include/net/net.h [code]
src/sys/include/net/netif.h [code]
src/sys/include/net/opt.h [code]
src/sys/include/net/pbuf.h [code]
src/sys/include/net/sockets.h [code]
src/sys/include/net/stats.h [code]
src/sys/include/net/sys.h [code]
src/sys/include/net/tcp.h [code]
src/sys/include/net/tcpip.h [code]
src/sys/include/net/udp.h [code]
src/sys/include/net/arch/cc.h [code]
src/sys/include/net/arch/cpu.h [code]
src/sys/include/net/arch/init.h [code]
src/sys/include/net/arch/lib.h [code]
src/sys/include/net/arch/perf.h [code]
src/sys/include/net/arch/sys_arch.h [code]
src/sys/include/net/ipv4/icmp.h [code]
src/sys/include/net/ipv4/inet.h [code]
src/sys/include/net/ipv4/ip.h [code]
src/sys/include/net/ipv4/ip_addr.h [code]
src/sys/include/net/ipv6/icmp.h [code]
src/sys/include/net/ipv6/inet.h [code]
src/sys/include/net/ipv6/ip.h [code]
src/sys/include/net/ipv6/ip_addr.h [code]
src/sys/include/netif/arp.h [code]
src/sys/include/netif/ethernetif.h [code]
src/sys/include/netif/loopif.h [code]
src/sys/include/netif/tcpdump.h [code]
src/sys/include/objgfx/ogDisplay_VESA.h [code]
src/sys/include/pci/hd.h [code]
src/sys/include/pci/lnc.h [code]
src/sys/include/pci/pci.h [code]
src/sys/include/ubixos/endtask.h [code]
src/sys/include/ubixos/exec.h [code]
src/sys/include/ubixos/fork.h [code]
src/sys/include/ubixos/init.h [code]
src/sys/include/ubixos/init.h [code]
src/sys/include/ubixos/kmod.h [code]
src/sys/include/ubixos/kpanic.h [code]
src/sys/include/ubixos/ld.h [code]
src/sys/lib/vsprintf.c [code]
src/sys/mpi/message.c [code]
src/sys/mpi/system.c [code]
src/sys/net/api/api_lib.c [code]
src/sys/net/api/api_msg.c [code]
src/sys/net/api/err.c [code]
src/sys/net/api/sockets.c [code]
src/sys/net/api/tcpip.c [code]
src/sys/net/net/bot.c [code]
src/sys/net/net/init.c [code]
src/sys/net/net/shell.c [code]
src/sys/net/net/shell.h [code]
src/sys/net/net/sys_arch.c [code]
src/sys/net/net/udpecho.c [code]
src/sys/net/net/udpecho.h [code]
src/sys/net/netif/arp.c [code]
src/sys/net/netif/ethernetif.c [code]
src/sys/net/netif/loopif.c [code]
src/sys/net/netif/tcpdump.c [code]
src/sys/pci/hd.c [code]
src/sys/pci/lnc.c [code]
src/sys/pci/pci.c [code]
src/sys/vmm/vmm_init.c [code]
src/sys/vmm/vmm_memory.c [code]


Defines
Variables
struct {
descriptorTableUnion *idt	__attribute__ ((packed))
descriptorTableUnion *idt	__attribute__ ((packed))
unsigned short limit	__attribute__ ((packed))
unsigned short limit	__attribute__ ((packed))
}	loadidt
}	loadidt


Defines
Variables
struct {
descriptorTableUnion *gdt	__attribute__ ((packed))
descriptorTableUnion *gdt	__attribute__ ((packed))
unsigned short limit	__attribute__ ((packed))
unsigned short limit	__attribute__ ((packed))
}	loadGDT
}	loadGDT


Functions
	asm (".globl ne2kISR \n""ne2kISR: \n"" pusha \n"" call ne2kHandler \n"" popa \n"" iret \n")
static int	dp_pkt2user (struct device *dev, int page, int length)
static int	dp_pkt2user (struct device *dev, int page, int length)
static int	dp_recv (struct device *)
static void	getblock (struct device dev, int page, size_t offset, size_t size, void dst)
static void	getblock (struct device dev, int page, size_t offset, size_t size, void dst)
int	ne2k_init ()
void	ne2kHandler ()
int	NICtoPC (struct device dev, void packet, int length, int nic_addr)
int	NICtoPC (struct device dev, void packet, int length, int nic_addr)
int	PCtoNIC (struct device dev, void packet, int length)
int	PCtoNIC (struct device dev, void packet, int length)
Variables
static struct device *	mDev = 0x0


Functions
int	i8259_init ()
void	irqDisable (uInt16 irqNo)
	initialize the 8259 PIC
void	irqDisable (u_int16_t irqNo)
void	irqEnable (uInt16 irqNo)
	disable specified IRQ
void	irqEnable (u_int16_t irqNo)
	enable specified IRQ
Variables
static unsigned int	irqMask = 0xFFFF


Typedefs
_item_t
_list_t
_UbixUser
api_msg
api_msg_msg
arp_entry
arp_hdr
arpcom
blockAllocationTableEntry
bootSect
eth_addr
eth_hdr
etheraddr
ethernetif
ethip_hdr
fcntl_args
file
fileDescriptorStruct
hostRingEntry
i386_frame
i387Struct
icmp_dur_hdr
icmp_echo_hdr
icmp_te_hdr
in_addr
initBlock
ioctl_args
ip_addr
ip_hdr
issetugid_args
kmod_struct
lncInfo
lwip_socket
mds
memDescriptor
mMap
mpi_message
munmap_args
net
netbuf
netconn
netif
nicBuffer
nicInfo
obreak_args
ogDisplay_UbixOS
ogDisplay_VESA
ogModeInfo
ogVESAInfo
open_args
osInfo
partitionInformation
pbuf
pciConfig
pipe_args
read_args
setitimer_args
sigaction_args
sigprocmask_args
sockaddr
sockaddr_in
stat
sys_mbox
sys_mbox_msg
sys_sem
sys_thread
sys_timeout
sys_timeouts
sysctl_args
sysctl_entry
taskStruct
tcp_hdr
tcp_pcb
tcp_pcb_listen
tcp_seg
tcpip_msg
thread
thread_start_param
timespec
timeStruct
timeval
timezone
TMode_Rec
tms
trapframe
tssStruct
tty_termNode
TVESA_Rec
ubixDiskLabel
ubixDiskLabel::ubixPartitions
ubixFSInfo
ubthread_list
ubthread_mutex
ubthread_mutex_list
udp_hdr
udp_pcb
ufs1_dinode
ufs2_dinode
userFileDescriptorStruct
vitalsStruct
write_args

#define	ETHTYPE_IP 0x0800
Functions
pbuf *	arp_arp_input (struct netif netif, struct eth_addr ethaddr, struct pbuf *p)
pbuf *	arp_arp_input (struct netif netif, struct eth_addr ethaddr, struct pbuf *p)
void	arp_init (void)
void	arp_ip_input (struct netif netif, struct pbuf p)
void	arp_ip_input (struct netif netif, struct pbuf p)
eth_addr *	arp_lookup (struct ip_addr *ipaddr)
eth_addr *	arp_lookup (struct ip_addr *ipaddr)
pbuf *	arp_query (struct netif netif, struct eth_addr ethaddr, struct ip_addr *ipaddr)
pbuf *	arp_query (struct netif netif, struct eth_addr ethaddr, struct ip_addr *ipaddr)
void	arp_tmr (void)

struct pbuf* arp_arp_input	struct pbuf* arp_arp_input	(	struct netif *	struct netif *	netif,
		struct pbuf *	struct pbuf *	p
void arp_ip_input	(	struct netif *	struct netif *	netif,
		struct pbuf *	struct pbuf *	p
struct eth_addr* arp_lookup	(	struct ip_addr *	struct ip_addr *	ipaddr	)

struct pbuf* arp_query	struct pbuf* arp_query	(	struct netif *	struct netif *	netif,
		struct ip_addr *	struct ip_addr *	ipaddr


Defines
#define	assert(e)
Functions
__BEGIN_DECLS void	__assert (const char , const char , int, const char *)
void	__assert (const char , const char , int, const char *)


Public Member Functions
virtual bool	ogAlias (ogSurface &, uInt32, uInt32, uInt32, uInt32)


Directories
directory	compile
directory	devfs
directory	include
directory	mpi
directory	net
directory	pci
directory	sys
directory	vmm
Files
file	Makefile.inc [code]


Files
file	elf.h [code]
file	fork.h [code]
file	init.h [code]
file	init.h [code]
file	kmod.h [code]
file	vitals.h [code]


Functions
void	ethernetif_init (struct netif *netif)
void	ethernetif_init (struct netif *netif)


Functions
int	fdc_init ()
int	fdcInit2 (struct device_node *dev)
int	fdcInit2 (struct device_node *dev)
void	fdcRead (void info, void baseAddr, uInt32 startSector, uInt32 sectorCount)


Functions
int	hdInit (struct device_node *dev)
int	hdInit (struct device_node *dev)
int	hdIoctl ()


Data Structures
#define	NSPARE 5
Functions
int	hdInit (struct device_node *dev)
int	hdInit (struct device_node *dev)
int	hdIoctl ()


Data Structures
Functions
Item_t *	CreateItem ()
int	DestroyItemList (IN List_t *ItemList)
int	DestroyItemList (List_t *ItemList)
int	DestroyItemsInList (IN List_t *ItemList)
int	DestroyItemsInList (List_t *ItemList)
Item_t *	GetFirstItem (IN List_t *kItem)
Item_t *	GetFirstItem (List_t *kItem)
Item_t *	GetLastItem (IN List_t *kItem)
Item_t *	GetLastItem (List_t *kItem)
List_t *	InitializeList ()
int	InsertItemAtFront (IN List_t TList, IN Item_t kItem)
int	InsertItemAtFront (List_t TList, Item_t kItem)
int	InsertItemBetweenItems (IN List_t TList, IN Item_t Previous, IN Item_t Next, IN Item_t Insert)
int	InsertItemBetweenItems (List_t TList, Item_t Previous, Item_t Next, Item_t Insert)
void	InsertItemListBetweenItems (IN Item_t Previous, IN Item_t Next, IN List_t *Insert)
void	InsertItemListBetweenItems (Item_t Previous, Item_t Next, List_t *Insert)
int	RemoveItem (IN List_t TList, IN Item_t kItem)
int	RemoveItem (List_t TList, Item_t kItem)
List_t *	RemoveItemListBetweenItems (IN Item_t Previous, IN Item_t Next)
List_t *	RemoveItemListBetweenItems (Item_t Previous, Item_t Next)

int InsertItemAtFront	(	IN List_t *	List_t *	TList,
		IN Item_t *	Item_t *	kItem

int InsertItemBetweenItems	(	IN List_t *	List_t *	TList,
		IN Item_t *	Item_t *	Previous,
		IN Item_t *	Item_t *	Next,
		IN Item_t *	Item_t *	Insert

void InsertItemListBetweenItems	(	IN Item_t *	Item_t *	Previous,
		IN Item_t *	Item_t *	Next,
		IN List_t *	List_t *	Insert

int RemoveItem	(	IN List_t *	List_t *	TList,
		IN Item_t *	Item_t *	kItem

List_t* RemoveItemListBetweenItems	(	IN Item_t *	Item_t *	Previous,
		IN Item_t *	Item_t *	Next


Functions
void	loopif_init (struct netif *netif)
void	loopif_init (struct netif *netif)

globl _start text code32 x472
pushl ebp movl ebp pushl x00000002
popfl ecx edi subl ecx xorl
-eax cld rep stosb

lgdtl (loadGDT) mov $0x10

lgdtl (loadGDT) mov $0x10

globl _start text code32 x472
pushl ebp movl ebp pushl x00000002
@@ -171,7 +171,7 @@

globl _start text code32 x472 pushl ebp movl ebp pushl x00000002 popfl ecx edi subl ecx xorl eax cld rep stosb lgdtl


Data Structures
#define	ENISR_ALL 0x3f
#define	ether_addr ether_addr_t
#define	ether_addr ether_addr_t
#define	NE1SM_START_PG 0x20
#define	TX_2X_PAGES 12
#define	TX_PAGES (dev->priv->pingPong ? TX_2X_PAGES : TX_1X_PAGES)
#define	TX_PAGES (dev->priv->pingPong ? TX_2X_PAGES : TX_1X_PAGES)
Typedefs
typedef dp_rcvhdr	dp_rcvhdr_t
typedef etheraddr	ether_addr
typedef etheraddr	ether_addr_t
Functions
int	ne2k_init ()
int	ne2kProbe (int, struct device *)
int	NICtoPC (struct device dev, void packet, int length, int nic_addr)
int	NICtoPC (struct device dev, void packet, int length, int nic_addr)
void	NS8390_init (struct device *dev, int startp)
void	NS8390_init (struct device *dev, int startp)
int	PCtoNIC (struct device dev, void packet, int length)
int	PCtoNIC (struct device dev, void packet, int length)
Variables
char *	nicPacket


Typedefs
uInt32	htons (uInt32 n)
int	inet_aton (char cp, struct in_addr addr) const
int	inet_aton (char cp, struct in_addr addr) const


Functions
int	pci_init ()
bool	pciProbe (int bus, int dev, int func, struct pciConfig *cfg)
bool	pciProbe (int bus, int dev, int func, struct pciConfig *cfg)
uInt32	pciRead (int bus, int dev, int func, int reg, int bytes)
uInt32	pciRead (int bus, int dev, int func, int reg, int bytes)
void	pciWrite (int bus, int dev, int func, int reg, uInt32 v, int bytes)
void	pciWrite (int bus, int dev, int func, int reg, uInt32 v, int bytes)
Variables
struct {
uInt8 subClass
}	pciClasses []
}	pciClasses []


Data Fields
__uint32_t	__bits [_SIG_WORDS]
__uint32_t	__bits [4]


Data Fields
u_int32_t	d_acylinders
u_int16_t	d_cylskew
u_int32_t	d_drivedata [NDDATA]
u_int32_t	d_drivedata [5]
u_int32_t	d_flags
char	d_packname [16]
bsd_disklabel::partition	d_partitions [MAXPARTITIONS]
bsd_disklabel::partition	d_partitions [8]
u_int16_t	d_rpm
u_int32_t	d_secsize
u_int32_t	d_spare [NSPARE]
u_int32_t	d_spare [5]
u_int16_t	d_sparespercyl


Data Fields
uInt16 *	attributes
Data Fields
int	fd
char	fd_l_ [PADL_(int)]
char	fd_l_ [0]
char	fd_r_ [PADR_(int)]
char	fd_r_ [(sizeof(register_t)<=sizeof(int)?0:sizeof(register_t)-sizeof(int))]


Data Fields
uInt32	dirBlock
Data Fields
__uint32_t	d_fileno
char	d_name [MAXNAMLEN+1]
char	d_name [255+1]
__uint8_t	d_namlen


Data Fields
char	blkbuf [VBLKSIZE]
char	blkbuf [(1<< 12)]
char	indbuf [VBLKSIZE]
char	indbuf [(1<< 12)]
char	sbbuf [SBLOCKSIZE]
char	sbbuf [8192]
char	secbuf [DEV_BSIZE]
char	secbuf [(1<< 9)]


Data Fields
const char *	devName
Data Fields
long	arg
char	arg_l_ [PADL_(long)]
char	arg_l_ [0]
char	arg_r_ [PADR_(long)]
char	arg_r_ [(sizeof(register_t)<=sizeof(long)?0:sizeof(register_t)-sizeof(long))]
int	cmd
char	cmd_l_ [PADL_(int)]
char	cmd_l_ [0]
char	cmd_r_ [PADR_(int)]
char	cmd_r_ [(sizeof(register_t)<=sizeof(int)?0:sizeof(register_t)-sizeof(int))]
int	fd
char	fd_l_ [PADL_(int)]
char	fd_l_ [0]
char	fd_r_ [PADR_(int)]
char	fd_r_ [(sizeof(register_t)<=sizeof(int)?0:sizeof(register_t)-sizeof(int))]