From 8d9e22df8afa4c3339e52c7b3b77388ca0e69fac Mon Sep 17 00:00:00 2001 From: Alex AUVOLAT Date: Fri, 28 Mar 2014 13:53:30 +0100 Subject: Make article 6 compile ; modifications to article 1 && 2 for the course. --- sos-code-article1/Makefile | 2 +- sos-code-article1/drivers/x86_videomem.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'sos-code-article1') 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 */...) -- cgit v1.2.3