Minor cleanups.

Remove some redundant code from Makefile.
Improve a couple of comments.

diff --git a/Makefile b/Makefile
index fcb5169d38c940936d83d4f70b0a0b295694c20f..1ffe500dc00733ac8f6c7172a484050067f28bdb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -96,10 +96,6 @@ $(OUT)rom16.o: $(OUT)romlayout16.o
        @echo "  Linking $@"
        $(Q)ld -melf_i386 -e post16 -Ttext 0 $< -o $@
 
-$(OUT)rom16.bin: $(OUT)rom16.o
-       @echo "  Extracting binary $@"
-       $(Q)objcopy -O binary $< $@
-
 $(OUT)romlayout32.o: $(OUT)rom16.offset.auto.h ; $(call whole-compile, $(CFLAGS), $(addprefix src/, $(SRC32)),$@)
 
 $(OUT)rom32.o: $(OUT)romlayout32.o $(OUT)rombios32.lds

diff --git a/src/apm.c b/src/apm.c
index 63bb44f9e3f7a469cf77f31fba9cde5f9fe2c7bb..1cb054ce8f5dc38c236822c401ae569241d02c0e 100644 (file)
--- a/src/apm.c
+++ b/src/apm.c
@@ -178,6 +178,7 @@ handle_1553XX(struct bregs *regs)
 void VISIBLE16
 handle_1553(struct bregs *regs)
 {
+    //debug_stub(regs);
     switch (regs->al) {
     case 0x00: handle_155300(regs); break;
     case 0x01: handle_155301(regs); break;

diff --git a/src/ata.h b/src/ata.h
index af64e1a604e654bd3e44de9aace6c734f48de809..763dbf119fd92b9099b1a2422cd8e209ae8e5979 100644 (file)
--- a/src/ata.h
+++ b/src/ata.h
@@ -9,7 +9,7 @@
 #define __ATA_H
 
 #include "types.h" // u16
-#include "atabits.h"
+#include "atabits.h" // ATA_CB_DH_DEV1
 
 struct ata_pio_command {
     void *far_buffer;

diff --git a/src/output.c b/src/output.c
index 0336610ee1bb3d9568f343c6b591c75f4484fa07..e22b15999a548b405329274171914f68122a9e37 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -20,7 +20,7 @@ screenc(u8 c)
     call16_int(0x10, &br);
 }
 
-// XXX
+// XXX - move PORT_DEBUG to standard place?
 #define PORT_DEBUG  0x403
 
 // Write a charcter to the framebuffer.