diff --git a/.gitignore b/.gitignore index 5bbe186..db9f010 100644 --- a/.gitignore +++ b/.gitignore @@ -22,9 +22,5 @@ /src/userland/helloworld/hello # SDK binaries -/src/sdk/bootdisk/bin/hello -/src/sdk/c.img - -node_modules -.grunt -_book +src/sdk/bootdisk/bin/hello +src/sdk/c.img diff --git a/src/devos-.zip b/src/devos-.zip new file mode 100644 index 0000000..da2972e Binary files /dev/null and b/src/devos-.zip differ diff --git a/src/kernel/modules/module.cc b/src/kernel/modules/module.cc index 59b4cb4..c4f396d 100644 --- a/src/kernel/modules/module.cc +++ b/src/kernel/modules/module.cc @@ -22,7 +22,7 @@ void Module::initLink(){ ModLink* mod; while (module_builder[i] != 0){ mod=new ModLink(module_builder[i]->module_name); - i=i++; + i++; } } @@ -38,7 +38,7 @@ File* Module::createDevice(char* name,char* module,u32 flag){ } } - i=i++; + i++; } return NULL; } @@ -61,7 +61,7 @@ File* Module::mount(char* dev,char* dir,char* module,u32 flag){ return NULL; } - i=i++; + i++; } return NULL; } @@ -79,7 +79,7 @@ File* Module::install(char* dir,char* module,u32 flag,char* dev){ } } - i=i++; + i++; } return NULL; } diff --git a/src/sdk/bootdisk/bin/hello b/src/sdk/bootdisk/bin/hello index 18f8055..296a849 100755 Binary files a/src/sdk/bootdisk/bin/hello and b/src/sdk/bootdisk/bin/hello differ diff --git a/src/sdk/bootdisk/boot/grub/menu.lst b/src/sdk/bootdisk/boot/grub/menu.lst index dcdfe4b..7a3f4cd 100644 --- a/src/sdk/bootdisk/boot/grub/menu.lst +++ b/src/sdk/bootdisk/boot/grub/menu.lst @@ -7,7 +7,3 @@ title=Dev Operating System (with init) kernel /kernel.elf module /bin/hello boot - -title=Dev Operating System - kernel /kernel.elf - boot diff --git a/src/sdk/c.img b/src/sdk/c.img index 0366a09..7b5fcf2 100644 Binary files a/src/sdk/c.img and b/src/sdk/c.img differ diff --git a/src/sdk/diskimage.sh b/src/sdk/diskimage.sh index 6d1d3d5..240246d 100755 --- a/src/sdk/diskimage.sh +++ b/src/sdk/diskimage.sh @@ -1,33 +1,34 @@ #!/bin/bash +rm c.img qemu-img create c.img 2M fdisk ./c.img << EOF x c -4 +16 h 16 s -63 +16 r n p 1 1 -4 +4095 a 1 w EOF fdisk -l -u ./c.img -losetup -o 32256 /dev/loop1 ./c.img +losetup -o 512 /dev/loop1 ./c.img -mke2fs /dev/loop1 +mke2fs -t ext2 /dev/loop1 mount /dev/loop1 /mnt/ cp -R bootdisk/* /mnt/ umount /mnt/ grub --device-map=/dev/null << EOF device (hd0) ./c.img -geometry (hd0) 4 16 63 +geometry (hd0) 16 16 16 root (hd0,0) setup (hd0) quit diff --git a/src/sdk/lib/libc.a b/src/sdk/lib/libc.a index 5b239ab..58917af 100644 Binary files a/src/sdk/lib/libc.a and b/src/sdk/lib/libc.a differ diff --git a/src/sdk/qemu.sh b/src/sdk/qemu.sh index 753cf7b..755b9a7 100755 --- a/src/sdk/qemu.sh +++ b/src/sdk/qemu.sh @@ -1,2 +1,2 @@ #!/bin/bash -qemu -m 1024 -s -hda ./c.img -curses -serial /dev/tty -redir tcp:2323::23 +qemu-system-i386 -m 1024 -hda ./c.img -curses -serial /dev/tty -redir tcp:2323::23 -gdb tcp::1234 diff --git a/src/sdk/src/libc/libc.a b/src/sdk/src/libc/libc.a index 5b239ab..58917af 100644 Binary files a/src/sdk/src/libc/libc.a and b/src/sdk/src/libc/libc.a differ diff --git a/src/userland/helloworld/hello b/src/userland/helloworld/hello index 18f8055..296a849 100755 Binary files a/src/userland/helloworld/hello and b/src/userland/helloworld/hello differ