From 713db869f6926b7886022faed99bb5e31e594608 Mon Sep 17 00:00:00 2001
From: Christophe Bothamy <cbbochs@free.fr>
Date: Fri, 13 Feb 2004 00:42:31 +0000
Subject: [PATCH] - implement atapi command 'CD-ROM capabilities & mech. status
 default values'   it helps during OS/2 install from cdrom.

---
 bochs/iodev/harddrv.cc | 37 ++++++++++++++++++++++++++++++++-----
 1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/bochs/iodev/harddrv.cc b/bochs/iodev/harddrv.cc
index d6fd1c03d..6d6ea21df 100644
--- a/bochs/iodev/harddrv.cc
+++ b/bochs/iodev/harddrv.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: harddrv.cc,v 1.119 2004-02-09 18:59:49 vruppert Exp $
+// $Id: harddrv.cc,v 1.120 2004-02-13 00:42:31 cbothamy Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2002  MandrakeSoft S.A.
@@ -161,7 +161,7 @@ bx_hard_drive_c::init(void)
   char  string[5];
   char  sbtext[8];
 
-  BX_DEBUG(("Init $Id: harddrv.cc,v 1.119 2004-02-09 18:59:49 vruppert Exp $"));
+  BX_DEBUG(("Init $Id: harddrv.cc,v 1.120 2004-02-13 00:42:31 cbothamy Exp $"));
 
   for (channel=0; channel<BX_MAX_ATA_CHANNEL; channel++) {
     if (bx_options.ata[channel].Opresent->get() == 1) {
@@ -1537,8 +1537,7 @@ if (channel == 0) {
 							      // Multisession, Mode 2 Form 2, Mode 2 Form 1
 							      BX_SELECTED_CONTROLLER(channel).buffer[12] = 0x70; 
 							      BX_SELECTED_CONTROLLER(channel).buffer[13] = (3 << 5);
-							      BX_SELECTED_CONTROLLER(channel).buffer[14] = (unsigned char)
-(1 |
+							      BX_SELECTED_CONTROLLER(channel).buffer[14] = (unsigned char) (1 |
 								      (BX_SELECTED_DRIVE(channel).cdrom.locked ? (1 << 1) : 0) |
 								      (1 << 3) |
 								      (1 << 5));
@@ -1610,10 +1609,38 @@ if (channel == 0) {
 
 					  case 0x2: // default values
 						switch (PageCode) {
+						      case 0x2a: // CD-ROM capabilities & mech. status, copied from current values
+						            init_send_atapi_command(channel, atapi_command, 28, alloc_length);
+							    init_mode_sense_single(channel, &BX_SELECTED_CONTROLLER(channel).buffer[8], 28);
+							    BX_SELECTED_CONTROLLER(channel).buffer[8] = 0x2a;
+							    BX_SELECTED_CONTROLLER(channel).buffer[9] = 0x12;
+							    BX_SELECTED_CONTROLLER(channel).buffer[10] = 0x00;
+							    BX_SELECTED_CONTROLLER(channel).buffer[11] = 0x00;
+							    // Multisession, Mode 2 Form 2, Mode 2 Form 1
+							    BX_SELECTED_CONTROLLER(channel).buffer[12] = 0x70; 
+							    BX_SELECTED_CONTROLLER(channel).buffer[13] = (3 << 5);
+							    BX_SELECTED_CONTROLLER(channel).buffer[14] = (unsigned char) (1 |
+								      (BX_SELECTED_DRIVE(channel).cdrom.locked ? (1 << 1) : 0) |
+								      (1 << 3) |
+								      (1 << 5));
+							    BX_SELECTED_CONTROLLER(channel).buffer[15] = 0x00;
+							    BX_SELECTED_CONTROLLER(channel).buffer[16] = (706 >> 8) & 0xff;
+							    BX_SELECTED_CONTROLLER(channel).buffer[17] = 706 & 0xff;
+							    BX_SELECTED_CONTROLLER(channel).buffer[18] = 0;
+							    BX_SELECTED_CONTROLLER(channel).buffer[19] = 2;
+							    BX_SELECTED_CONTROLLER(channel).buffer[20] = (512 >> 8) & 0xff;
+							    BX_SELECTED_CONTROLLER(channel).buffer[21] = 512 & 0xff;
+							    BX_SELECTED_CONTROLLER(channel).buffer[22] = (706 >> 8) & 0xff;
+							    BX_SELECTED_CONTROLLER(channel).buffer[23] = 706 & 0xff;
+							    BX_SELECTED_CONTROLLER(channel).buffer[24] = 0;
+							    BX_SELECTED_CONTROLLER(channel).buffer[25] = 0;
+							    BX_SELECTED_CONTROLLER(channel).buffer[26] = 0;
+							    BX_SELECTED_CONTROLLER(channel).buffer[27] = 0;
+							    ready_to_send_atapi(channel);
+							    break;
 						      case 0x01: // error recovery
 						      case 0x0d: // CD-ROM
 						      case 0x0e: // CD-ROM audio control
-						      case 0x2a: // CD-ROM capabilities & mech. status
 						      case 0x3f: // all
 							    BX_PANIC(("cdrom: MODE SENSE (dflt), code=%x",
 								     PageCode));