move usb mass storage defines to usb.h

With the arrival of usb attached scsi support they
will be needed outside usb-msd.c too.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

diff --git a/src/usb-msc.h b/src/usb-msc.h
index 31c81b9532669bc1ad0a3c4cdffc1703f854c274..3746b7740cd646981ee50f1e2839172134057f37 100644 (file)
--- a/src/usb-msc.h
+++ b/src/usb-msc.h
@@ -7,15 +7,4 @@ int usb_cmd_data(struct disk_op_s *op, void *cdbcmd, u16 blocksize);
 struct usbdevice_s;
 int usb_msc_init(struct usbdevice_s *usbdev);
 
-
-/****************************************************************
- * MSC flags
- ****************************************************************/
-
-#define US_SC_ATAPI_8020   0x02
-#define US_SC_ATAPI_8070   0x05
-#define US_SC_SCSI         0x06
-
-#define US_PR_BULK         0x50
-
 #endif // ush-msc.h

diff --git a/src/usb.h b/src/usb.h
index 2c961e6ec4d2bf26b4c003e589bdac567dc013dd..474722417112d8d8a4ed67e2ee9fa963bb2feea6 100644 (file)
--- a/src/usb.h
+++ b/src/usb.h
@@ -205,6 +205,16 @@ struct usb_endpoint_descriptor {
 #define USB_ENDPOINT_MAX_ADJUSTABLE     0x80
 
 
+/****************************************************************
+ * usb mass storage flags
+ ****************************************************************/
+
+#define US_SC_ATAPI_8020   0x02
+#define US_SC_ATAPI_8070   0x05
+#define US_SC_SCSI         0x06
+
+#define US_PR_BULK         0x50
+
 /****************************************************************
  * function defs
  ****************************************************************/