2008-08-29 Andy Grover <andy.grover@oracle.com>

        * include/ddk/scsi.h: Define READ_TOC formats.

        * lib/ddk/scsiport.def (ScsiPortGetDeviceBase): Fix export.

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 15f5136..16c1632 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,5 +1,10 @@
 2008-08-29  Andy Grover  <andy.grover@oracle.com>
 
+       * include/ddk/scsi.h: Define READ_TOC formats.
+       * lib/ddk/scsiport.def (ScsiPortGetDeviceBase): Fix export.
+
+2008-08-29  Andy Grover  <andy.grover@oracle.com>
+
        * include/ddk/ndis.h (NDIS_MINIPORT_MAJOR_VERSION, NDIS_MINIPORT_MINOR_VERSION,
        struct NDIS_TASK_OFFLOAD_HEADER, PROTOCOL_RESERVED_SIZE_IN_PACKET,
        NdisGetFirstBufferFromPacketSafe, NdisMIndicateReceivePacket,

diff --git a/winsup/w32api/include/ddk/scsi.h b/winsup/w32api/include/ddk/scsi.h
index 65adcdd..885db66 100644 (file)
--- a/winsup/w32api/include/ddk/scsi.h
+++ b/winsup/w32api/include/ddk/scsi.h
@@ -1272,6 +1272,13 @@ typedef struct _SENSE_DATA {
 #define IOCTL_SCSI_MINIPORT_NOT_QUORUM_CAPABLE  ((FILE_DEVICE_SCSI << 16) + 0x0520)
 #define IOCTL_SCSI_MINIPORT_NOT_CLUSTER_CAPABLE ((FILE_DEVICE_SCSI << 16) + 0x0521)
 
+/* READ_TOC formats */
+#define READ_TOC_FORMAT_TOC         0x00
+#define READ_TOC_FORMAT_SESSION     0x01
+#define READ_TOC_FORMAT_FULL_TOC    0x02
+#define READ_TOC_FORMAT_PMA         0x03
+#define READ_TOC_FORMAT_ATIP        0x04
+
 /* Read Capacity Data. Returned in Big Endian format */
 typedef struct _READ_CAPACITY_DATA {
   ULONG  LogicalBlockAddress;

diff --git a/winsup/w32api/lib/ddk/scsiport.def b/winsup/w32api/lib/ddk/scsiport.def
index 1965161..f7050c2 100644 (file)
--- a/winsup/w32api/lib/ddk/scsiport.def
+++ b/winsup/w32api/lib/ddk/scsiport.def
@@ -8,7 +8,7 @@ ScsiPortConvertUlongToPhysicalAddress@4
 ScsiPortFlushDma@4
 ScsiPortFreeDeviceBase@8
 ScsiPortGetBusData@24
-ScsiPortGetDeviceBase@24
+ScsiPortGetDeviceBase@28
 ScsiPortGetLogicalUnit@16
 ScsiPortGetPhysicalAddress@16
 ScsiPortGetSrb@20