diff options
| author | Alex AUVOLAT <alex.auvolat@ens.fr> | 2014-03-28 13:53:30 +0100 |
|---|---|---|
| committer | Alex AUVOLAT <alex.auvolat@ens.fr> | 2014-03-28 13:53:30 +0100 |
| commit | 8d9e22df8afa4c3339e52c7b3b77388ca0e69fac (patch) | |
| tree | 16234b646d18399e07f90f78324de54b031f014b /sos-code-article1 | |
| parent | bdce62a91076aa1a076d484ce1d8564a8ba0988f (diff) | |
| download | SOS-8d9e22df8afa4c3339e52c7b3b77388ca0e69fac.tar.gz SOS-8d9e22df8afa4c3339e52c7b3b77388ca0e69fac.zip | |
Make article 6 compile ; modifications to article 1 && 2 for the course.
Diffstat (limited to 'sos-code-article1')
| -rw-r--r-- | sos-code-article1/Makefile | 2 | ||||
| -rw-r--r-- | sos-code-article1/drivers/x86_videomem.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/sos-code-article1/Makefile b/sos-code-article1/Makefile index a0c82b2..cf14445 100644 --- a/sos-code-article1/Makefile +++ b/sos-code-article1/Makefile @@ -20,7 +20,7 @@ $(MULTIBOOT_IMAGE): $(KERNEL_OBJ) exit -1; \ fi cp $(KERNEL_OBJ) cdrom - echo timeout 0 > cdrom/boot/grub/menu.lst + echo timeout 10 > cdrom/boot/grub/menu.lst echo title Simple OS >> cdrom/boot/grub/menu.lst echo kernel /$(KERNEL_OBJ) >> cdrom/boot/grub/menu.lst genisoimage -R -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 \ diff --git a/sos-code-article1/drivers/x86_videomem.c b/sos-code-article1/drivers/x86_videomem.c index cc4b79c..d05a0e4 100644 --- a/sos-code-article1/drivers/x86_videomem.c +++ b/sos-code-article1/drivers/x86_videomem.c @@ -112,7 +112,6 @@ sos_ret_t sos_x86_videomem_putchar(unsigned char row, unsigned char col, return SOS_OK; } - sos_ret_t sos_x86_videomem_printf(unsigned char row, unsigned char col, unsigned char attribute, const char *format, /* args */...) |