Clean up request type helpers

3 files changed, 30 insertions, 43 deletions

diff --git a/os/hal/include/usbh/defs.h b/os/hal/include/usbh/defs.h
index 0c90af4..5e0c466 100644
--- a/os/hal/include/usbh/defs.h
+++ b/os/hal/include/usbh/defs.h
@@ -141,18 +141,17 @@ typedef PACKED_STRUCT {
 #define USBH_REQ_SET_INTERFACE           0x0B

 #define USBH_REQ_SYNCH_FRAME             0x0C

 

+#define USBH_REQTYPE_DIR_IN				0x80

+#define USBH_REQTYPE_DIR_OUT			0x00

 

-#define USBH_REQTYPE_IN					0x80

-#define USBH_REQTYPE_OUT				0x00

+#define USBH_REQTYPE_TYPE_STANDARD		0x00

+#define USBH_REQTYPE_TYPE_CLASS			0x20

+#define USBH_REQTYPE_TYPE_VENDOR		0x40

 

-#define USBH_REQTYPE_STANDARD			0x00

-#define USBH_REQTYPE_CLASS				0x20

-#define USBH_REQTYPE_VENDOR				0x40

-

-#define USBH_REQTYPE_DEVICE				0x00

-#define USBH_REQTYPE_INTERFACE			0x01

-#define USBH_REQTYPE_ENDPOINT			0x02

-#define USBH_REQTYPE_OTHER				0x03

+#define USBH_REQTYPE_RECIP_DEVICE		0x00

+#define USBH_REQTYPE_RECIP_INTERFACE	0x01

+#define USBH_REQTYPE_RECIP_ENDPOINT		0x02

+#define USBH_REQTYPE_RECIP_OTHER		0x03

 

 #endif

 

diff --git a/os/hal/include/usbh/dev/hub.h b/os/hal/include/usbh/dev/hub.h
index dd4ec54..4a35aae 100644
--- a/os/hal/include/usbh/dev/hub.h
+++ b/os/hal/include/usbh/dev/hub.h
@@ -106,7 +106,7 @@ static inline usbh_urbstatus_t usbhhubControlRequest(USBHDriver *host,
 

 static inline usbh_urbstatus_t usbhhubClearFeaturePort(usbh_port_t *port, uint8_t feature) {

 	return usbhhubControlRequest(port->device.host,

-				USBH_REQTYPE_OUT | USBH_REQTYPE_CLASS | USBH_REQTYPE_OTHER,

+				USBH_REQTYPE_DIR_OUT | USBH_REQTYPE_TYPE_CLASS | USBH_REQTYPE_RECIP_OTHER,

 				USBH_REQ_CLEAR_FEATURE,

 				feature,

 				port->number,

@@ -116,7 +116,7 @@ static inline usbh_urbstatus_t usbhhubClearFeaturePort(usbh_port_t *port, uint8_
 

 static inline usbh_urbstatus_t usbhhubClearFeatureHub(USBHDriver *host, uint8_t feature) {

 	return usbhhubControlRequest(host,

-				USBH_REQTYPE_OUT | USBH_REQTYPE_CLASS | USBH_REQTYPE_DEVICE,

+				USBH_REQTYPE_DIR_OUT | USBH_REQTYPE_TYPE_CLASS | USBH_REQTYPE_RECIP_DEVICE,

 				USBH_REQ_CLEAR_FEATURE,

 				feature,

 				0,

@@ -126,7 +126,7 @@ static inline usbh_urbstatus_t usbhhubClearFeatureHub(USBHDriver *host, uint8_t
 

 static inline usbh_urbstatus_t usbhhubSetFeaturePort(usbh_port_t *port, uint8_t feature) {

 	return usbhhubControlRequest(port->device.host,

-				USBH_REQTYPE_OUT | USBH_REQTYPE_CLASS | USBH_REQTYPE_OTHER,

+				USBH_REQTYPE_DIR_OUT | USBH_REQTYPE_TYPE_CLASS | USBH_REQTYPE_RECIP_OTHER,

 				USBH_REQ_SET_FEATURE,

 				feature,

 				port->number,

diff --git a/os/hal/include/usbh/internal.h b/os/hal/include/usbh/internal.h
index b56906f..70d2f7a 100644
--- a/os/hal/include/usbh/internal.h
+++ b/os/hal/include/usbh/internal.h
@@ -55,29 +55,17 @@ bool _usbh_urb_abortI(usbh_urb_t *urb, usbh_urbstatus_t status);
 void _usbh_urb_abort_and_waitS(usbh_urb_t *urb, usbh_urbstatus_t status);

 

 

-#define USBH_CLASSIN(type, req, value, index)	\

-	(USBH_REQTYPE_IN | type | USBH_REQTYPE_CLASS), \

-	req, \

-	value, \

-	index

-

-#define USBH_CLASSOUT(type, req, value, index)	\

-	(USBH_REQTYPE_OUT | type | USBH_REQTYPE_CLASS), \

-	req, \

-	value, \

-	index

-

-#define USBH_STANDARDIN(type, req, value, index)	\

-	(USBH_REQTYPE_IN | type | USBH_REQTYPE_STANDARD), \

-	req, \

-	value, \

-	index

-

-#define USBH_STANDARDOUT(type, req, value, index)	\

-	(USBH_REQTYPE_OUT | type | USBH_REQTYPE_STANDARD), \

-	req, \

-	value, \

-	index

+#define USBH_REQTYPE_CLASSIN(type)	\

+	(USBH_REQTYPE_DIR_IN | type | USBH_REQTYPE_TYPE_CLASS)

+

+#define USBH_REQTYPE_CLASSOUT(type)	\

+	(USBH_REQTYPE_DIR_OUT | type | USBH_REQTYPE_TYPE_CLASS)

+

+#define USBH_REQTYPE_STANDARDIN(type)	\

+	(USBH_REQTYPE_DIR_IN | type | USBH_REQTYPE_TYPE_STANDARD)

+

+#define USBH_REQTYPE_STANDARDOUT(type)	\

+	(USBH_REQTYPE_DIR_OUT | type | USBH_REQTYPE_TYPE_STANDARD)

 

 

 #define USBH_PID_DATA0            0

@@ -88,19 +76,19 @@ void _usbh_urb_abort_and_waitS(usbh_urb_t *urb, usbh_urbstatus_t status);
 

 

 /* GetBusState and SetHubDescriptor are optional, omitted */

-#define ClearHubFeature   (((USBH_REQTYPE_OUT | USBH_REQTYPE_CLASS | USBH_REQTYPE_DEVICE) << 8) \

+#define ClearHubFeature   (((USBH_REQTYPE_DIR_OUT | USBH_REQTYPE_TYPE_CLASS | USBH_REQTYPE_RECIP_DEVICE) << 8) \

 							| USBH_REQ_CLEAR_FEATURE)

-#define SetHubFeature     (((USBH_REQTYPE_OUT | USBH_REQTYPE_CLASS | USBH_REQTYPE_DEVICE) << 8) \

+#define SetHubFeature     (((USBH_REQTYPE_DIR_OUT | USBH_REQTYPE_TYPE_CLASS | USBH_REQTYPE_RECIP_DEVICE) << 8) \

 							| USBH_REQ_SET_FEATURE)

-#define ClearPortFeature   (((USBH_REQTYPE_OUT | USBH_REQTYPE_CLASS | USBH_REQTYPE_OTHER) << 8) \

+#define ClearPortFeature   (((USBH_REQTYPE_DIR_OUT | USBH_REQTYPE_TYPE_CLASS | USBH_REQTYPE_RECIP_OTHER) << 8) \

 							| USBH_REQ_CLEAR_FEATURE)

-#define SetPortFeature     (((USBH_REQTYPE_OUT | USBH_REQTYPE_CLASS | USBH_REQTYPE_OTHER) << 8) \

+#define SetPortFeature     (((USBH_REQTYPE_DIR_OUT | USBH_REQTYPE_TYPE_CLASS | USBH_REQTYPE_RECIP_OTHER) << 8) \

 							| USBH_REQ_SET_FEATURE)

-#define GetHubDescriptor  (((USBH_REQTYPE_IN | USBH_REQTYPE_CLASS | USBH_REQTYPE_DEVICE) << 8) \

+#define GetHubDescriptor  (((USBH_REQTYPE_DIR_IN | USBH_REQTYPE_TYPE_CLASS | USBH_REQTYPE_RECIP_DEVICE) << 8) \

 							| USBH_REQ_GET_DESCRIPTOR)

-#define GetHubStatus      (((USBH_REQTYPE_IN | USBH_REQTYPE_CLASS | USBH_REQTYPE_DEVICE) << 8) \

+#define GetHubStatus      (((USBH_REQTYPE_DIR_IN | USBH_REQTYPE_TYPE_CLASS | USBH_REQTYPE_RECIP_DEVICE) << 8) \

 							| USBH_REQ_GET_STATUS)

-#define GetPortStatus     (((USBH_REQTYPE_IN | USBH_REQTYPE_CLASS | USBH_REQTYPE_OTHER) << 8) \

+#define GetPortStatus     (((USBH_REQTYPE_DIR_IN | USBH_REQTYPE_TYPE_CLASS | USBH_REQTYPE_RECIP_OTHER) << 8) \

 							| USBH_REQ_GET_STATUS)