socsvn commit: r257364 - soc2013/zcore/head/usr.sbin/bhyve

[zcore at FreeBSD.org]

Author: zcore
Date: Sun Sep 15 09:50:42 2013
New Revision: 257364
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=257364

Log:
  use self-defined OPCODES

Modified:
  soc2013/zcore/head/usr.sbin/bhyve/pci_ahci.c

Modified: soc2013/zcore/head/usr.sbin/bhyve/pci_ahci.c
==============================================================================
--- soc2013/zcore/head/usr.sbin/bhyve/pci_ahci.c	Sun Sep 15 09:50:15 2013	(r257363)
+++ soc2013/zcore/head/usr.sbin/bhyve/pci_ahci.c	Sun Sep 15 09:50:42 2013	(r257364)
@@ -72,6 +72,22 @@
 };
 
 /*
+ * SCSI opcodes
+ */
+#define TEST_UNIT_READY		0x00
+#define REQUEST_SENSE		0x03
+#define INQUIRY			0x12
+#define START_STOP_UNIT		0x1B
+#define PREVENT_ALLOW		0x1E
+#define READ_CAPACITY		0x25
+#define READ_10			0x28
+#define POSITION_TO_ELEMENT	0x2B
+#define READ_TOC		0x43
+#define MODE_SENSE_10		0x5A
+#define READ_12			0xA8
+#define READ_CD			0xBE
+
+/*
  * Debug printf
  */
 #ifdef AHCI_DEBUG
@@ -894,28 +910,28 @@
 	}
 
 	switch (acmd[0]) {
-	case ATAPI_TEST_UNIT_READY:
+	case TEST_UNIT_READY:
 		cfis[4] = (cfis[4] & ~7) | ATA_I_CMD | ATA_I_IN;
 		ahci_write_fis_d2h(p, slot, cfis, ATA_S_READY | ATA_S_DSC);
 		break;
-	case ATAPI_INQUIRY:
+	case INQUIRY:
 		atapi_inquiry(p, slot, cfis);
 		break;
-	case ATAPI_READ_CAPACITY:
+	case READ_CAPACITY:
 		atapi_read_capacity(p, slot, cfis);
 		break;
-	case ATAPI_PREVENT_ALLOW:
+	case PREVENT_ALLOW:
 		/* TODO */
 		cfis[4] = (cfis[4] & ~7) | ATA_I_CMD | ATA_I_IN;
 		ahci_write_fis_d2h(p, slot, cfis, ATA_S_READY | ATA_S_DSC);
 		break;
-	case ATAPI_READ_TOC:
+	case READ_TOC:
 		atapi_read_toc(p, slot, cfis);
 		break;
-	case ATAPI_READ_BIG:
+	case READ_10:
 		atapi_read(p, slot, cfis);
 		break;
-	case ATAPI_REQUEST_SENSE:
+	case REQUEST_SENSE:
 		atapi_request_sense(p, slot, cfis);
 		break;
 	default: