From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:52624) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ss98b-0000gj-NQ for qemu-devel@nongnu.org; Fri, 20 Jul 2012 05:04:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ss98V-0003a4-6J for qemu-devel@nongnu.org; Fri, 20 Jul 2012 05:04:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:27033) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ss98U-0003Zj-Ub for qemu-devel@nongnu.org; Fri, 20 Jul 2012 05:04:35 -0400 From: Gerd Hoffmann Date: Fri, 20 Jul 2012 10:59:23 +0200 Message-Id: <1342774765-20640-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1342774765-20640-1-git-send-email-kraxel@redhat.com> References: <1342774765-20640-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH v2 1/3] move usb mass storage defines to usb.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: seabios@seabios.org, qemu-devel@nongnu.org Cc: Gerd Hoffmann 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 @@ -206,6 +206,16 @@ struct usb_endpoint_descriptor { /**************************************************************** + * 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 ****************************************************************/ -- 1.7.1