From: James Mckenzie <jamesmck@taoand.(none)>
Date: Wed, 9 Sep 2009 02:22:21 +0000 (+0100)
Subject: K&R prototypes how 1983
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=3a692c3d22303f1c8dcff01a2866c97ce4da80a7;p=xenclient%2Fxen-pq.git

K&R prototypes how 1983
---

diff --git a/master/boot-second-cd b/master/boot-second-cd
index 3a37ad7..dc884c4 100644
--- a/master/boot-second-cd
+++ b/master/boot-second-cd
@@ -1,26 +1,20 @@
 diff --git a/tools/firmware/rombios/rombios.c b/tools/firmware/rombios/rombios.c
-index bb1c8e7..3baf417 100644
+index bb1c8e7..4d73bce 100644
 --- a/tools/firmware/rombios/rombios.c
 +++ b/tools/firmware/rombios/rombios.c
-@@ -960,7 +960,7 @@ void   cdemu_init();
- Bit8u  cdemu_isactive();
- Bit8u  cdemu_emulated_drive();
- 
--Bit16u cdrom_boot();
-+Bit16u cdrom_boot(Bit16u);
- 
- #endif // BX_ELTORITO_BOOT
- 
-@@ -3703,7 +3703,7 @@ static char eltorito[24]="EL TORITO SPECIFICATION";
+@@ -3702,8 +3702,9 @@ static char eltorito[24]="EL TORITO SPECIFICATION";
+ //
  // Returns ah: emulated drive, al: error code
  //
-   Bit16u
+-  Bit16u
 -cdrom_boot()
-+cdrom_boot(Bit16u which)
++Bit16u
++cdrom_boot(which)
++Bit16u which;
  {
    Bit16u ebda_seg=read_word(0x0040,0x000E);
    Bit8u  atacmd[12], buffer[2048];
-@@ -3713,7 +3713,8 @@ cdrom_boot()
+@@ -3713,7 +3714,8 @@ cdrom_boot()
  
    // Find out the first cdrom
    for (device=0; device<BX_MAX_ATA_DEVICES;device++) {
@@ -30,7 +24,7 @@ index bb1c8e7..3baf417 100644
      }
  
    // if not found
-@@ -8330,7 +8331,9 @@ ASM_END
+@@ -8330,7 +8332,9 @@ ASM_END
  
  #if BX_ELTORITO_BOOT
    case IPL_TYPE_CDROM: /* CD-ROM */