diff --git a/src/sys/drivers/keyboard.c b/src/sys/drivers/keyboard.c index 2f21c94..ca5a830 100755 --- a/src/sys/drivers/keyboard.c +++ b/src/sys/drivers/keyboard.c @@ -183,7 +183,6 @@ setLeds(); } /* Pick Which Key Map */ - kprintf("[[%i]]\n",controlKeys); if (controlKeys == 1) { keyMap = 1; } else if (controlKeys == 2) { keyMap = 2; } else if (controlKeys == 4) { keyMap = 3; } diff --git a/src/sys/include/ubixfs/file.h b/src/sys/include/ubixfs/file.h index 73ef045..6671ec1 100755 --- a/src/sys/include/ubixfs/file.h +++ b/src/sys/include/ubixfs/file.h @@ -37,7 +37,7 @@ uShort status; uShort mode; uShort offset; - uShort size; + uLong size; uShort length; uLong start; uChar fileName[22]; diff --git a/src/sys/include/ubixfs/ubixfs.h b/src/sys/include/ubixfs/ubixfs.h index b273e35..d156ae8 100755 --- a/src/sys/include/ubixfs/ubixfs.h +++ b/src/sys/include/ubixfs/ubixfs.h @@ -31,9 +31,8 @@ uChar fileName[22]; uShort start; uShort length; - uShort size; + uLong size; uShort attributes; - uShort reserved; }; struct bootSect { diff --git a/src/sys/kernel/syscall.c b/src/sys/kernel/syscall.c index 9ed929f..322fa65 100755 --- a/src/sys/kernel/syscall.c +++ b/src/sys/kernel/syscall.c @@ -99,7 +99,8 @@ newLoc = (char *)programHeader->phVaddr; for (x=0;x<=i;x++) { newLoc[x] = binarySpace[x]; - } + } + kprintf("La [%i]\n",i); asm( "jmp *%0\n" : diff --git a/src/sys/ubixfs/file.c b/src/sys/ubixfs/file.c index aad940b..4db405a 100755 --- a/src/sys/ubixfs/file.c +++ b/src/sys/ubixfs/file.c @@ -53,6 +53,7 @@ fdTable[i].mode = mode; fdTable[i].status = fdOpen; fdTable[i].offset = 0; + kprintf("Size: [%i]\n",fdTable[i].size); return(i); } else { return((int)-1); } diff --git a/src/tools/ubixfs.h b/src/tools/ubixfs.h index 0363b59..2491412 100755 --- a/src/tools/ubixfs.h +++ b/src/tools/ubixfs.h @@ -30,9 +30,8 @@ uChar fileName[22]; uShort start; uShort length; - uShort size; + uLong size; uShort attributes; - uShort reserved; }; struct bootSect { diff --git a/ubixos.kdevprj b/ubixos.kdevprj index 1c10bfd..e0b532f 100755 --- a/ubixos.kdevprj +++ b/ubixos.kdevprj @@ -600,7 +600,7 @@ type=DATA [src/sys/kernel/Makefile.am] -files=src/sys/kernel/Makefile,src/sys/kernel/io.c,src/sys/kernel/version.c,src/sys/kernel/kprintf.c,src/sys/kernel/vsprintf.c,src/sys/kernel/idt.c,src/sys/kernel/exec.c,src/sys/kernel/schedule.c,src/sys/kernel/dma.c,src/sys/kernel/idlethread.c,src/sys/kernel/syscall.c,src/sys/kernel/fork.c,src/sys/kernel/kmalloc.c +files=src/sys/kernel/Makefile,src/sys/kernel/io.c,src/sys/kernel/version.c,src/sys/kernel/kprintf.c,src/sys/kernel/vsprintf.c,src/sys/kernel/idt.c,src/sys/kernel/exec.c,src/sys/kernel/schedule.c,src/sys/kernel/dma.c,src/sys/kernel/idlethread.c,src/sys/kernel/syscall.c,src/sys/kernel/fork.c,src/sys/kernel/kmalloc.c,src/sys/kernel/spinlock.c sub_dirs= type=static_library @@ -658,6 +658,12 @@ install_location= type=SOURCE +[src/sys/kernel/spinlock.c] +dist=true +install=false +install_location= +type=SOURCE + [src/sys/kernel/syscall.c] dist=true install=false