Compilation fix

bochs/CHANGES

@@ -17,12 +17,17 @@ Detailed change log :
 
 - Configure and compile
   - Added ability to configure CPUID vendor/brand strings through .bochsrc
-    (patch from @SF by Doug Reed)
+    (patch from @SF by Doug Reed).
+  - Removed Peter Tattam's closed source external debugger interface from
+    the code.
 
 - Misc
   - Updated Bochs TESTFORM to version 0.4
 
 - SF patches applied
+ [2137774] Patch to fix bug: cdrom: read_block: lseek returned error by Gabor Olah
+ [2134642] Fix scan_to_scanascii table for F11 and F12 by Ben Guthro & Steve Ofsthun
+ [2123036] sdl fullscreen fix by ggbsf
  [2073039] Remove CMOS accsess from AML code by Gleb Natapov
  [2072168] smbios: add L1-L3 cache handle to processor information by Sebastian
  [2055416] bochsrc cpu options for cpuid vendor and brand string by Doug Reed
@@ -47,6 +52,7 @@ Detailed change log :
  [1981505] Init PIIX4 PCI to ISA bridge and IDE by Sebastian
 
 - these S.F. bugs were closed
+ [2106514] RIS / startrom.com install ALMOST works
  [2123358] SMP (HTT): wbinvd executed by CPU1 crashes CPU0
  [2029758] BEV can return via retf instead of int 18h
  [2026501] El Torito incorrect boot segment:offset

bochs/bochs.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: bochs.h,v 1.233 2008-10-01 09:44:40 sshwarts Exp $
+// $Id: bochs.h,v 1.234 2008-10-02 06:49:20 sshwarts Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2002  MandrakeSoft S.A.
@@ -198,9 +198,9 @@ void print_tree(bx_param_c *node, int level = 0);
 #define BX_GET_ENABLE_A20()         bx_pc_system.get_enable_a20()
 
 #if BX_SUPPORT_A20
-#  define A20ADDR(x)                (bx_phy_address(x) & bx_pc_system.a20_mask)
+#  define A20ADDR(x)                ((bx_phy_address)(x) & bx_pc_system.a20_mask)
 #else
-#  define A20ADDR(x)                (bx_phy_address(x))
+#  define A20ADDR(x)                ((bx_phy_address)(x))
 #endif
 
 #if BX_SUPPORT_SMP