From 5208d93bc76a495ff0662d157ffe1699a976e008 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Fri, 20 Jul 2012 10:59:23 +0200 Subject: [PATCH] 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 --- src/usb-msc.h | 11 ----------- src/usb.h | 10 ++++++++++ 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/usb-msc.h b/src/usb-msc.h index 31c81b9..3746b77 100644 --- 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 2c961e6..4747224 100644 --- 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 ****************************************************************/ -- 2.39.5