Misc minor cleanups.

diff --git a/TODO b/TODO
index 6180d5be4998c182d5e7460977b13cde8d6e4fef..94d2465cb5cec7e6261dff04895f27d3f8b6fd58 100644 (file)
--- a/TODO
+++ b/TODO
@@ -18,7 +18,7 @@ cvs tip.
   * bochs cvs 20081016:           -- better post resume support
   * coreboot (r3348):    20060708 -- no noteworthy enhancements
   * qemu (r5536):        20080603 -- has cmos smp count
-  * kvm (45a442c):       20071016 -- acpi dsdt changes, e820 vmx
+  * kvm (1a33292):       20071016 -- acpi dsdt changes, e820 vmx
     pages, setup mtrrs, clear tsc, acpi intsrcovr table, different pci
     irqs, smbios always uses 16 cpus, no acpi ssdt, fadt->gpe0_blk set
   * virtualbox (r13560): 20061231 -- lots of mouse changes, logo,

diff --git a/src/ata.c b/src/ata.c
index ffc410f55fe96e871bd6f9f03ff1863bb1b2ca82..f245e21199cf58f5fd3fdf7b6fb87329572bfb10 100644 (file)
--- a/src/ata.c
+++ b/src/ata.c
@@ -578,7 +578,7 @@ get_ata_version(u8 *buffer)
 static void
 init_drive_atapi(int driveid)
 {
-    SET_EBDA(ata.devices[driveid].type,ATA_TYPE_ATAPI);
+    SET_EBDA(ata.devices[driveid].type, ATA_TYPE_ATAPI);
 
     // Temporary values to do the transfer
     SET_EBDA(ata.devices[driveid].device,ATA_DEVICE_CDROM);
@@ -821,7 +821,7 @@ init_drive_ata(int driveid)
 static void
 init_drive_unknown(int driveid)
 {
-    SET_EBDA(ata.devices[driveid].type,ATA_TYPE_UNKNOWN);
+    SET_EBDA(ata.devices[driveid].type, ATA_TYPE_UNKNOWN);
 
     u8 channel = driveid / 2;
     u8 slave = driveid % 2;

diff --git a/src/disk.c b/src/disk.c
index 84b452f295c4c835de75f98853e9e3149188ab02..23501ff3de643e003e572a99c49b216ef7ea7e82 100644 (file)
--- a/src/disk.c
+++ b/src/disk.c
@@ -487,7 +487,7 @@ disk_1348(struct bregs *regs, u8 device)
     SET_INT13DPT(regs, iface_type[6], 0);
     SET_INT13DPT(regs, iface_type[7], 0);
 
-    SET_INT13DPT(regs, device_path, device%2);
+    SET_INT13DPT(regs, device_path, slave);
 
     SET_INT13DPT(regs, checksum, -checksum(MAKE_FARPTR(regs->ds, 30), 35));
 

diff --git a/tools/checkstack.py b/tools/checkstack.py
index 680c0335d2c3dbca81047a8ec6ffb51413f067d5..8eafa975c309e9d88e8c0eb6361f849076503ae6 100755 (executable)
--- a/tools/checkstack.py
+++ b/tools/checkstack.py
@@ -13,8 +13,8 @@ import sys
 import re
 
 # List of functions we can assume are never called.
-#IGNORE = ['screenc', 'BX_PANIC', '__dprintf']
-IGNORE = ['screenc', 'BX_PANIC']
+#IGNORE = ['BX_PANIC', '__dprintf']
+IGNORE = ['BX_PANIC']
 
 # Find out maximum stack usage for a function
 def calcmaxstack(funcs, funcaddr):