Merge branch 'master' into fix-nrf51-port

16 files changed, 455 insertions, 455 deletions

diff --git a/os/hal/include/hal_community.h b/os/hal/include/hal_community.h
index 144e495..6420964 100644
--- a/os/hal/include/hal_community.h
+++ b/os/hal/include/hal_community.h
@@ -30,16 +30,16 @@
 /* Shared headers.*/

 

 /* Normal drivers.*/

-#include "nand.h"

-#include "eicu.h"

-#include "rng.h"

-#include "usbh.h"

-#include "timcap.h"

+#include "hal_nand.h"

+#include "hal_eicu.h"

+#include "hal_rng.h"

+#include "hal_usbh.h"

+#include "hal_timcap.h"

 

 /* Complex drivers.*/

-#include "onewire.h"

-#include "crc.h"

-#include "eeprom.h"

+#include "hal_onewire.h"

+#include "hal_crc.h"

+#include "hal_eeprom.h"

 

 /*===========================================================================*/

 /* Driver constants.                                                         */

diff --git a/os/hal/include/crc.h b/os/hal/include/hal_crc.h
index afa27e1..8c4c895 100644
--- a/os/hal/include/crc.h
+++ b/os/hal/include/hal_crc.h
@@ -72,7 +72,7 @@ typedef enum {
   CRC_COMPLETE               /* Asynchronous operation complete.           */
 } crcstate_t;
 
-#include "crc_lld.h"
+#include "hal_crc_lld.h"
 #include "crcsw.h" /* Include software LL driver */
 
 
diff --git a/os/hal/include/ee24xx.h b/os/hal/include/hal_ee24xx.h
index ab12fd1..ab12fd1 100644
--- a/os/hal/include/ee24xx.h
+++ b/os/hal/include/hal_ee24xx.h
diff --git a/os/hal/include/ee25xx.h b/os/hal/include/hal_ee25xx.h
index fc2ad6f..fc2ad6f 100644
--- a/os/hal/include/ee25xx.h
+++ b/os/hal/include/hal_ee25xx.h
diff --git a/os/hal/include/eeprom.h b/os/hal/include/hal_eeprom.h
index b0fd360..b0fd360 100644
--- a/os/hal/include/eeprom.h
+++ b/os/hal/include/hal_eeprom.h
diff --git a/os/hal/include/eicu.h b/os/hal/include/hal_eicu.h
index d9e08de..d4b0ed2 100644
--- a/os/hal/include/eicu.h
+++ b/os/hal/include/hal_eicu.h
@@ -90,7 +90,7 @@ typedef struct EICUDriver EICUDriver;
 typedef void (*eicucallback_t)(EICUDriver *eicup, eicuchannel_t channel,
                                uint32_t width, uint32_t period);
 
-#include "eicu_lld.h"
+#include "hal_eicu_lld.h"
 
 /*===========================================================================*/
 /* Driver macros.                                                            */
diff --git a/os/hal/include/nand.h b/os/hal/include/hal_nand.h
index ffd5de7..d5a1c04 100644
--- a/os/hal/include/nand.h
+++ b/os/hal/include/hal_nand.h
@@ -89,7 +89,7 @@ typedef enum {
  */
 typedef struct NANDDriver NANDDriver;
 
-#include "nand_lld.h"
+#include "hal_nand_lld.h"
 
 /*===========================================================================*/
 /* Driver macros.                                                            */
diff --git a/os/hal/include/onewire.h b/os/hal/include/hal_onewire.h
index 2d27f48..2d27f48 100644
--- a/os/hal/include/onewire.h
+++ b/os/hal/include/hal_onewire.h
diff --git a/os/hal/include/rng.h b/os/hal/include/hal_rng.h
index 0e3c484..0e3c484 100644
--- a/os/hal/include/rng.h
+++ b/os/hal/include/hal_rng.h
diff --git a/os/hal/include/timcap.h b/os/hal/include/hal_timcap.h
index a848783..a848783 100644
--- a/os/hal/include/timcap.h
+++ b/os/hal/include/hal_timcap.h
diff --git a/os/hal/include/usbh.h b/os/hal/include/hal_usbh.h
index 2f8f3dd..8029be8 100644
--- a/os/hal/include/usbh.h
+++ b/os/hal/include/hal_usbh.h
@@ -1,439 +1,439 @@
-/*

-    ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio

-              Copyright (C) 2015 Diego Ismirlian, TISA, (dismirlian (at) google's mail)

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-#ifndef USBH_H_

-#define USBH_H_

-

-#include "hal.h"

-

-#ifndef HAL_USE_USBH

-#define HAL_USE_USBH FALSE

-#endif

-

-#ifndef HAL_USBH_USE_FTDI

-#define HAL_USBH_USE_FTDI FALSE

-#endif

-

-#ifndef HAL_USBH_USE_HUB

-#define HAL_USBH_USE_HUB FALSE

-#endif

-

-#ifndef HAL_USBH_USE_MSD

-#define HAL_USBH_USE_MSD FALSE

-#endif

-

-#ifndef HAL_USBH_USE_UVC

-#define HAL_USBH_USE_UVC FALSE

-#endif

-

-#if HAL_USE_USBH

-

-#include "osal.h"

-#include "usbh/list.h"

-#include "usbh/defs.h"

-

-/* TODO:

- *

- * - Integrate VBUS power switching functionality to the API.

- *

- */

-

-

-/*===========================================================================*/

-/* Derived constants and error checks.                                       */

-/*===========================================================================*/

-

-#if !HAL_USBH_USE_HUB

-#define USBH_MAX_ADDRESSES				1

-#else

-#define USBH_MAX_ADDRESSES				(HAL_USBHHUB_MAX_PORTS + 1)

-#endif

-

-enum usbh_status {

-	USBH_STATUS_STOPPED = 0,

-	USBH_STATUS_STARTED,

-	USBH_STATUS_SUSPENDED,

-};

-

-enum usbh_devstatus {

-	USBH_DEVSTATUS_DISCONNECTED = 0,

-	USBH_DEVSTATUS_ATTACHED,

-	USBH_DEVSTATUS_CONNECTED,

-	USBH_DEVSTATUS_DEFAULT,

-	USBH_DEVSTATUS_ADDRESS,

-	USBH_DEVSTATUS_CONFIGURED,

-};

-

-enum usbh_devspeed {

-	USBH_DEVSPEED_LOW = 0,

-	USBH_DEVSPEED_FULL,

-	USBH_DEVSPEED_HIGH,

-};

-

-enum usbh_epdir {

-	USBH_EPDIR_IN		= 0x80,

-	USBH_EPDIR_OUT		= 0

-};

-

-enum usbh_eptype {

-	USBH_EPTYPE_CTRL	= 0,

-	USBH_EPTYPE_ISO		= 1,

-	USBH_EPTYPE_BULK	= 2,

-	USBH_EPTYPE_INT		= 3,

-};

-

-enum usbh_epstatus {

-	USBH_EPSTATUS_UNINITIALIZED = 0,

-	USBH_EPSTATUS_CLOSED,

-	USBH_EPSTATUS_OPEN,

-	USBH_EPSTATUS_HALTED,

-};

-

-enum usbh_urbstatus {

-	USBH_URBSTATUS_UNINITIALIZED = 0,

-	USBH_URBSTATUS_INITIALIZED,

-	USBH_URBSTATUS_PENDING,

-//	USBH_URBSTATUS_QUEUED,

-	USBH_URBSTATUS_ERROR,

-	USBH_URBSTATUS_TIMEOUT,

-	USBH_URBSTATUS_CANCELLED,

-	USBH_URBSTATUS_STALL,

-	USBH_URBSTATUS_DISCONNECTED,

-//	USBH_URBSTATUS_EPCLOSED,

-	USBH_URBSTATUS_OK,

-};

-

-/*===========================================================================*/

-/* Driver data structures and types.                                         */

-/*===========================================================================*/

-

-/* forward declarations */

-typedef struct USBHDriver USBHDriver;

-typedef struct usbh_port usbh_port_t;

-typedef	struct usbh_device usbh_device_t;

-typedef struct usbh_ep usbh_ep_t;

-typedef struct usbh_urb usbh_urb_t;

-typedef struct usbh_baseclassdriver usbh_baseclassdriver_t;

-typedef struct usbh_classdriverinfo usbh_classdriverinfo_t;

-#if HAL_USBH_USE_HUB

-typedef struct USBHHubDriver USBHHubDriver;

-#endif

-

-/* typedefs */

-typedef enum usbh_status usbh_status_t;

-typedef enum usbh_devspeed usbh_devspeed_t;

-typedef enum usbh_devstatus usbh_devstatus_t;

-typedef enum usbh_epdir usbh_epdir_t;

-typedef enum usbh_eptype usbh_eptype_t;

-typedef enum usbh_epstatus usbh_epstatus_t;

-typedef enum usbh_urbstatus usbh_urbstatus_t;

-typedef uint16_t usbh_portstatus_t;

-typedef uint16_t usbh_portcstatus_t;

-typedef void (*usbh_completion_cb)(usbh_urb_t *);

-

-/* include the low level driver; the required definitions are above */

-#include "usbh_lld.h"

-

-#define USBH_DEFINE_BUFFER(type, name)	USBH_LLD_DEFINE_BUFFER(type, name)

-

-struct usbh_urb {

-	usbh_ep_t *ep;

-

-	void *userData;

-	usbh_completion_cb callback;

-

-	const void *setup_buff;

-	void *buff;

-	uint32_t requestedLength;

-	uint32_t actualLength;

-

-	usbh_urbstatus_t status;

-

-	thread_reference_t waitingThread;

-	thread_reference_t abortingThread;

-

-	/* Low level part */

-	_usbh_urb_ll_data

-};

-

-struct usbh_ep {

-	usbh_device_t		*device;

-	usbh_ep_t	 		*next;

-

-	usbh_epstatus_t		status;

-	uint8_t 			address;

-	bool				in;

-	usbh_eptype_t		type;

-	uint16_t			wMaxPacketSize;

-	uint8_t				bInterval;

-

-	/* debug */

-	const char			*name;

-

-	/* Low-level part */

-	_usbh_ep_ll_data

-};

-

-struct usbh_device {

-	USBHDriver *host;	/* shortcut to host */

-

-	usbh_ep_t ctrl;

-	usbh_ep_t *endpoints;

-

-	usbh_baseclassdriver_t *drivers;

-

-	uint16_t langID0;

-

-	usbh_devstatus_t status;

-	usbh_devspeed_t speed;

-

-	USBH_DEFINE_BUFFER(usbh_device_descriptor_t, devDesc);

-	unsigned char align_bytes[2];

-	USBH_DEFINE_BUFFER(usbh_config_descriptor_t, basicConfigDesc);

-

-	uint8_t *fullConfigurationDescriptor;

-	uint8_t keepFullCfgDesc;

-

-	uint8_t address;

-	uint8_t bConfiguration;

-

-	/* Low level part */

-	_usbh_device_ll_data

-};

-

-

-struct usbh_port {

-#if HAL_USBH_USE_HUB

-	USBHHubDriver *hub;

-#endif

-

-	usbh_portstatus_t status;

-	usbh_portcstatus_t c_status;

-

-	usbh_port_t *next;

-

-	uint8_t number;

-

-	usbh_device_t device;

-

-	/* Low level part */

-	_usbh_port_ll_data

-};

-

-struct USBHDriver {

-	usbh_status_t status;

-	uint8_t address_bitmap[(USBH_MAX_ADDRESSES + 7) / 8];

-

-	usbh_port_t rootport;

-

-#if HAL_USBH_USE_HUB

-	struct list_head hubs;

-#endif

-

-	/* Low level part */

-	_usbhdriver_ll_data

-

-#if USBH_DEBUG_ENABLE

-	/* debug */

-	uint8_t dbg_buff[USBH_DEBUG_BUFFER];

-	THD_WORKING_AREA(waDebug, 512);

-	input_queue_t iq;

-#endif

-};

-

-

-

-/*===========================================================================*/

-/* External declarations.                                                    */

-/*===========================================================================*/

-

-#if STM32_USBH_USE_OTG1

-extern USBHDriver USBHD1;

-#endif

-

-#if STM32_USBH_USE_OTG2

-extern USBHDriver USBHD2;

-#endif

-

-

-/*===========================================================================*/

-/* Main driver API.		                                                     */

-/*===========================================================================*/

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-	/* Main functions */

-	void usbhObjectInit(USBHDriver *usbh);

-	void usbhInit(void);

-	void usbhStart(USBHDriver *usbh);

-	void usbhStop(USBHDriver *usbh);

-	void usbhSuspend(USBHDriver *usbh);

-	void usbhResume(USBHDriver *usbh);

-

-	/* Device-related */

-#if	USBH_DEBUG_ENABLE && USBH_DEBUG_ENABLE_INFO

-	void usbhDevicePrintInfo(usbh_device_t *dev);

-	void usbhDevicePrintConfiguration(const uint8_t *descriptor, uint16_t rem);

-#else

-#	define usbhDevicePrintInfo(dev) do {} while(0)

-#	define usbhDevicePrintConfiguration(descriptor, rem) do {} while(0)

-#endif

-	bool usbhDeviceReadString(usbh_device_t *dev, char *dest, uint8_t size,

-			uint8_t index, uint16_t langID);

-	static inline usbh_port_t *usbhDeviceGetPort(usbh_device_t *dev) {

-		return container_of(dev, usbh_port_t, device);

-	}

-

-	/* Synchronous API */

-	usbh_urbstatus_t usbhBulkTransfer(usbh_ep_t *ep,

-			void *data,

-			uint32_t len,

-			uint32_t *actual_len,

-			systime_t timeout);

-	usbh_urbstatus_t usbhControlRequest(usbh_device_t *dev,

-			uint8_t bmRequestType,

-			uint8_t bRequest,

-			uint16_t wValue,

-			uint16_t wIndex,

-			uint16_t wLength,

-			uint8_t *buff);

-	usbh_urbstatus_t usbhControlRequestExtended(usbh_device_t *dev,

-			const usbh_control_request_t *req,

-			uint8_t *buff,

-			uint32_t *actual_len,

-			systime_t timeout);

-

-	/* Standard request helpers */

-	bool usbhStdReqGetDeviceDescriptor(usbh_device_t *dev,

-			uint16_t wLength,

-			uint8_t *buf);

-	bool usbhStdReqGetConfigurationDescriptor(usbh_device_t *dev,

-			uint8_t index,

-			uint16_t wLength,

-			uint8_t *buf);

-	bool usbhStdReqGetStringDescriptor(usbh_device_t *dev,

-			uint8_t index,

-			uint16_t langID,

-			uint16_t wLength,

-			uint8_t *buf);

-	bool usbhStdReqSetInterface(usbh_device_t *dev,

-			uint8_t bInterfaceNumber,

-			uint8_t bAlternateSetting);

-	bool usbhStdReqGetInterface(usbh_device_t *dev,

-			uint8_t bInterfaceNumber,

-			uint8_t *bAlternateSetting);

-

-	/* Endpoint/pipe management */

-	void usbhEPObjectInit(usbh_ep_t *ep, usbh_device_t *dev, const usbh_endpoint_descriptor_t *desc);

-	static inline void usbhEPOpen(usbh_ep_t *ep) {

-		osalDbgCheck(ep != 0);

-		osalSysLock();

-		osalDbgAssert(ep->status == USBH_EPSTATUS_CLOSED, "invalid state");

-		usbh_lld_ep_open(ep);

-		ep->next = ep->device->endpoints;

-		ep->device->endpoints = ep;

-		osalSysUnlock();

-	}

-	static inline void usbhEPCloseS(usbh_ep_t *ep) {

-		osalDbgCheck(ep != 0);

-		osalDbgCheckClassS();

-		osalDbgAssert(ep->status != USBH_EPSTATUS_UNINITIALIZED, "invalid state");

-		if (ep->status == USBH_EPSTATUS_CLOSED) {

-			osalOsRescheduleS();

-			return;

-		}

-		usbh_lld_ep_close(ep);

-	}

-	static inline void usbhEPClose(usbh_ep_t *ep) {

-		osalSysLock();

-		usbhEPCloseS(ep);

-		osalSysUnlock();

-	}

-	static inline void usbhEPResetI(usbh_ep_t *ep) {

-		osalDbgCheckClassI();

-		osalDbgCheck(ep != NULL);

-		usbh_lld_epreset(ep);

-	}

-	static inline bool usbhEPIsPeriodic(usbh_ep_t *ep) {

-		osalDbgCheck(ep != NULL);

-		return (ep->type & 1) != 0;

-	}

-	static inline bool usbhURBIsBusy(usbh_urb_t *urb) {

-		osalDbgCheck(urb != NULL);

-		return (urb->status == USBH_URBSTATUS_PENDING);

-	}

-	static inline void usbhEPSetName(usbh_ep_t *ep, const char *name) {

-		ep->name = name;

-	}

-

-	/* URB management */

-	void usbhURBObjectInit(usbh_urb_t *urb, usbh_ep_t *ep, usbh_completion_cb callback,

-			void *user, void *buff, uint32_t len);

-	void usbhURBObjectResetI(usbh_urb_t *urb);

-	void usbhURBSubmitI(usbh_urb_t *urb);

-	bool usbhURBCancelI(usbh_urb_t *urb);

-	msg_t usbhURBSubmitAndWaitS(usbh_urb_t *urb, systime_t timeout);

-	void usbhURBCancelAndWaitS(usbh_urb_t *urb);

-	msg_t usbhURBWaitTimeoutS(usbh_urb_t *urb, systime_t timeout);

-

-	/* Main loop */

-	void usbhMainLoop(USBHDriver *usbh);

-

-#ifdef __cplusplus

-}

-#endif

-

-

-/*===========================================================================*/

-/* Class driver definitions and API.                                         */

-/*===========================================================================*/

-

-typedef struct usbh_classdriver_vmt usbh_classdriver_vmt_t;

-struct usbh_classdriver_vmt {

-	usbh_baseclassdriver_t *(*load)(usbh_device_t *dev,	const uint8_t *descriptor, uint16_t rem);

-	void (*unload)(usbh_baseclassdriver_t *drv);

-};

-

-struct usbh_classdriverinfo {

-	int16_t class;

-	int16_t subclass;

-	int16_t protocol;

-	const char *name;

-	const usbh_classdriver_vmt_t *vmt;

-};

-

-#define _usbh_base_classdriver_data		\

-	const usbh_classdriverinfo_t *info;	\

-	usbh_device_t *dev;					\

-	usbh_baseclassdriver_t *next;

-

-struct usbh_baseclassdriver {

-	_usbh_base_classdriver_data

-};

-

-

-/*===========================================================================*/

-/* Helper functions.				                                         */

-/*===========================================================================*/

-#include <usbh/desciter.h>	/* descriptor iterators */

-#include <usbh/debug.h>		/* debug */

-

-#endif

-

-#endif /* USBH_H_ */

+/*
+    ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio
+              Copyright (C) 2015 Diego Ismirlian, TISA, (dismirlian (at) google's mail)
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#ifndef USBH_H_
+#define USBH_H_
+
+#include "hal.h"
+
+#ifndef HAL_USE_USBH
+#define HAL_USE_USBH FALSE
+#endif
+
+#ifndef HAL_USBH_USE_FTDI
+#define HAL_USBH_USE_FTDI FALSE
+#endif
+
+#ifndef HAL_USBH_USE_HUB
+#define HAL_USBH_USE_HUB FALSE
+#endif
+
+#ifndef HAL_USBH_USE_MSD
+#define HAL_USBH_USE_MSD FALSE
+#endif
+
+#ifndef HAL_USBH_USE_UVC
+#define HAL_USBH_USE_UVC FALSE
+#endif
+
+#if HAL_USE_USBH
+
+#include "osal.h"
+#include "usbh/list.h"
+#include "usbh/defs.h"
+
+/* TODO:
+ *
+ * - Integrate VBUS power switching functionality to the API.
+ *
+ */
+
+
+/*===========================================================================*/
+/* Derived constants and error checks.                                       */
+/*===========================================================================*/
+
+#if !HAL_USBH_USE_HUB
+#define USBH_MAX_ADDRESSES				1
+#else
+#define USBH_MAX_ADDRESSES				(HAL_USBHHUB_MAX_PORTS + 1)
+#endif
+
+enum usbh_status {
+	USBH_STATUS_STOPPED = 0,
+	USBH_STATUS_STARTED,
+	USBH_STATUS_SUSPENDED,
+};
+
+enum usbh_devstatus {
+	USBH_DEVSTATUS_DISCONNECTED = 0,
+	USBH_DEVSTATUS_ATTACHED,
+	USBH_DEVSTATUS_CONNECTED,
+	USBH_DEVSTATUS_DEFAULT,
+	USBH_DEVSTATUS_ADDRESS,
+	USBH_DEVSTATUS_CONFIGURED,
+};
+
+enum usbh_devspeed {
+	USBH_DEVSPEED_LOW = 0,
+	USBH_DEVSPEED_FULL,
+	USBH_DEVSPEED_HIGH,
+};
+
+enum usbh_epdir {
+	USBH_EPDIR_IN		= 0x80,
+	USBH_EPDIR_OUT		= 0
+};
+
+enum usbh_eptype {
+	USBH_EPTYPE_CTRL	= 0,
+	USBH_EPTYPE_ISO		= 1,
+	USBH_EPTYPE_BULK	= 2,
+	USBH_EPTYPE_INT		= 3,
+};
+
+enum usbh_epstatus {
+	USBH_EPSTATUS_UNINITIALIZED = 0,
+	USBH_EPSTATUS_CLOSED,
+	USBH_EPSTATUS_OPEN,
+	USBH_EPSTATUS_HALTED,
+};
+
+enum usbh_urbstatus {
+	USBH_URBSTATUS_UNINITIALIZED = 0,
+	USBH_URBSTATUS_INITIALIZED,
+	USBH_URBSTATUS_PENDING,
+//	USBH_URBSTATUS_QUEUED,
+	USBH_URBSTATUS_ERROR,
+	USBH_URBSTATUS_TIMEOUT,
+	USBH_URBSTATUS_CANCELLED,
+	USBH_URBSTATUS_STALL,
+	USBH_URBSTATUS_DISCONNECTED,
+//	USBH_URBSTATUS_EPCLOSED,
+	USBH_URBSTATUS_OK,
+};
+
+/*===========================================================================*/
+/* Driver data structures and types.                                         */
+/*===========================================================================*/
+
+/* forward declarations */
+typedef struct USBHDriver USBHDriver;
+typedef struct usbh_port usbh_port_t;
+typedef	struct usbh_device usbh_device_t;
+typedef struct usbh_ep usbh_ep_t;
+typedef struct usbh_urb usbh_urb_t;
+typedef struct usbh_baseclassdriver usbh_baseclassdriver_t;
+typedef struct usbh_classdriverinfo usbh_classdriverinfo_t;
+#if HAL_USBH_USE_HUB
+typedef struct USBHHubDriver USBHHubDriver;
+#endif
+
+/* typedefs */
+typedef enum usbh_status usbh_status_t;
+typedef enum usbh_devspeed usbh_devspeed_t;
+typedef enum usbh_devstatus usbh_devstatus_t;
+typedef enum usbh_epdir usbh_epdir_t;
+typedef enum usbh_eptype usbh_eptype_t;
+typedef enum usbh_epstatus usbh_epstatus_t;
+typedef enum usbh_urbstatus usbh_urbstatus_t;
+typedef uint16_t usbh_portstatus_t;
+typedef uint16_t usbh_portcstatus_t;
+typedef void (*usbh_completion_cb)(usbh_urb_t *);
+
+/* include the low level driver; the required definitions are above */
+#include "hal_usbh_lld.h"
+
+#define USBH_DEFINE_BUFFER(type, name)	USBH_LLD_DEFINE_BUFFER(type, name)
+
+struct usbh_urb {
+	usbh_ep_t *ep;
+
+	void *userData;
+	usbh_completion_cb callback;
+
+	const void *setup_buff;
+	void *buff;
+	uint32_t requestedLength;
+	uint32_t actualLength;
+
+	usbh_urbstatus_t status;
+
+	thread_reference_t waitingThread;
+	thread_reference_t abortingThread;
+
+	/* Low level part */
+	_usbh_urb_ll_data
+};
+
+struct usbh_ep {
+	usbh_device_t		*device;
+	usbh_ep_t	 		*next;
+
+	usbh_epstatus_t		status;
+	uint8_t 			address;
+	bool				in;
+	usbh_eptype_t		type;
+	uint16_t			wMaxPacketSize;
+	uint8_t				bInterval;
+
+	/* debug */
+	const char			*name;
+
+	/* Low-level part */
+	_usbh_ep_ll_data
+};
+
+struct usbh_device {
+	USBHDriver *host;	/* shortcut to host */
+
+	usbh_ep_t ctrl;
+	usbh_ep_t *endpoints;
+
+	usbh_baseclassdriver_t *drivers;
+
+	uint16_t langID0;
+
+	usbh_devstatus_t status;
+	usbh_devspeed_t speed;
+
+	USBH_DEFINE_BUFFER(usbh_device_descriptor_t, devDesc);
+	unsigned char align_bytes[2];
+	USBH_DEFINE_BUFFER(usbh_config_descriptor_t, basicConfigDesc);
+
+	uint8_t *fullConfigurationDescriptor;
+	uint8_t keepFullCfgDesc;
+
+	uint8_t address;
+	uint8_t bConfiguration;
+
+	/* Low level part */
+	_usbh_device_ll_data
+};
+
+
+struct usbh_port {
+#if HAL_USBH_USE_HUB
+	USBHHubDriver *hub;
+#endif
+
+	usbh_portstatus_t status;
+	usbh_portcstatus_t c_status;
+
+	usbh_port_t *next;
+
+	uint8_t number;
+
+	usbh_device_t device;
+
+	/* Low level part */
+	_usbh_port_ll_data
+};
+
+struct USBHDriver {
+	usbh_status_t status;
+	uint8_t address_bitmap[(USBH_MAX_ADDRESSES + 7) / 8];
+
+	usbh_port_t rootport;
+
+#if HAL_USBH_USE_HUB
+	struct list_head hubs;
+#endif
+
+	/* Low level part */
+	_usbhdriver_ll_data
+
+#if USBH_DEBUG_ENABLE
+	/* debug */
+	uint8_t dbg_buff[USBH_DEBUG_BUFFER];
+	THD_WORKING_AREA(waDebug, 512);
+	input_queue_t iq;
+#endif
+};
+
+
+
+/*===========================================================================*/
+/* External declarations.                                                    */
+/*===========================================================================*/
+
+#if STM32_USBH_USE_OTG1
+extern USBHDriver USBHD1;
+#endif
+
+#if STM32_USBH_USE_OTG2
+extern USBHDriver USBHD2;
+#endif
+
+
+/*===========================================================================*/
+/* Main driver API.		                                                     */
+/*===========================================================================*/
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+	/* Main functions */
+	void usbhObjectInit(USBHDriver *usbh);
+	void usbhInit(void);
+	void usbhStart(USBHDriver *usbh);
+	void usbhStop(USBHDriver *usbh);
+	void usbhSuspend(USBHDriver *usbh);
+	void usbhResume(USBHDriver *usbh);
+
+	/* Device-related */
+#if	USBH_DEBUG_ENABLE && USBH_DEBUG_ENABLE_INFO
+	void usbhDevicePrintInfo(usbh_device_t *dev);
+	void usbhDevicePrintConfiguration(const uint8_t *descriptor, uint16_t rem);
+#else
+#	define usbhDevicePrintInfo(dev) do {} while(0)
+#	define usbhDevicePrintConfiguration(descriptor, rem) do {} while(0)
+#endif
+	bool usbhDeviceReadString(usbh_device_t *dev, char *dest, uint8_t size,
+			uint8_t index, uint16_t langID);
+	static inline usbh_port_t *usbhDeviceGetPort(usbh_device_t *dev) {
+		return container_of(dev, usbh_port_t, device);
+	}
+
+	/* Synchronous API */
+	usbh_urbstatus_t usbhBulkTransfer(usbh_ep_t *ep,
+			void *data,
+			uint32_t len,
+			uint32_t *actual_len,
+			systime_t timeout);
+	usbh_urbstatus_t usbhControlRequest(usbh_device_t *dev,
+			uint8_t bmRequestType,
+			uint8_t bRequest,
+			uint16_t wValue,
+			uint16_t wIndex,
+			uint16_t wLength,
+			uint8_t *buff);
+	usbh_urbstatus_t usbhControlRequestExtended(usbh_device_t *dev,
+			const usbh_control_request_t *req,
+			uint8_t *buff,
+			uint32_t *actual_len,
+			systime_t timeout);
+
+	/* Standard request helpers */
+	bool usbhStdReqGetDeviceDescriptor(usbh_device_t *dev,
+			uint16_t wLength,
+			uint8_t *buf);
+	bool usbhStdReqGetConfigurationDescriptor(usbh_device_t *dev,
+			uint8_t index,
+			uint16_t wLength,
+			uint8_t *buf);
+	bool usbhStdReqGetStringDescriptor(usbh_device_t *dev,
+			uint8_t index,
+			uint16_t langID,
+			uint16_t wLength,
+			uint8_t *buf);
+	bool usbhStdReqSetInterface(usbh_device_t *dev,
+			uint8_t bInterfaceNumber,
+			uint8_t bAlternateSetting);
+	bool usbhStdReqGetInterface(usbh_device_t *dev,
+			uint8_t bInterfaceNumber,
+			uint8_t *bAlternateSetting);
+
+	/* Endpoint/pipe management */
+	void usbhEPObjectInit(usbh_ep_t *ep, usbh_device_t *dev, const usbh_endpoint_descriptor_t *desc);
+	static inline void usbhEPOpen(usbh_ep_t *ep) {
+		osalDbgCheck(ep != 0);
+		osalSysLock();
+		osalDbgAssert(ep->status == USBH_EPSTATUS_CLOSED, "invalid state");
+		usbh_lld_ep_open(ep);
+		ep->next = ep->device->endpoints;
+		ep->device->endpoints = ep;
+		osalSysUnlock();
+	}
+	static inline void usbhEPCloseS(usbh_ep_t *ep) {
+		osalDbgCheck(ep != 0);
+		osalDbgCheckClassS();
+		osalDbgAssert(ep->status != USBH_EPSTATUS_UNINITIALIZED, "invalid state");
+		if (ep->status == USBH_EPSTATUS_CLOSED) {
+			osalOsRescheduleS();
+			return;
+		}
+		usbh_lld_ep_close(ep);
+	}
+	static inline void usbhEPClose(usbh_ep_t *ep) {
+		osalSysLock();
+		usbhEPCloseS(ep);
+		osalSysUnlock();
+	}
+	static inline void usbhEPResetI(usbh_ep_t *ep) {
+		osalDbgCheckClassI();
+		osalDbgCheck(ep != NULL);
+		usbh_lld_epreset(ep);
+	}
+	static inline bool usbhEPIsPeriodic(usbh_ep_t *ep) {
+		osalDbgCheck(ep != NULL);
+		return (ep->type & 1) != 0;
+	}
+	static inline bool usbhURBIsBusy(usbh_urb_t *urb) {
+		osalDbgCheck(urb != NULL);
+		return (urb->status == USBH_URBSTATUS_PENDING);
+	}
+	static inline void usbhEPSetName(usbh_ep_t *ep, const char *name) {
+		ep->name = name;
+	}
+
+	/* URB management */
+	void usbhURBObjectInit(usbh_urb_t *urb, usbh_ep_t *ep, usbh_completion_cb callback,
+			void *user, void *buff, uint32_t len);
+	void usbhURBObjectResetI(usbh_urb_t *urb);
+	void usbhURBSubmitI(usbh_urb_t *urb);
+	bool usbhURBCancelI(usbh_urb_t *urb);
+	msg_t usbhURBSubmitAndWaitS(usbh_urb_t *urb, systime_t timeout);
+	void usbhURBCancelAndWaitS(usbh_urb_t *urb);
+	msg_t usbhURBWaitTimeoutS(usbh_urb_t *urb, systime_t timeout);
+
+	/* Main loop */
+	void usbhMainLoop(USBHDriver *usbh);
+
+#ifdef __cplusplus
+}
+#endif
+
+
+/*===========================================================================*/
+/* Class driver definitions and API.                                         */
+/*===========================================================================*/
+
+typedef struct usbh_classdriver_vmt usbh_classdriver_vmt_t;
+struct usbh_classdriver_vmt {
+	usbh_baseclassdriver_t *(*load)(usbh_device_t *dev,	const uint8_t *descriptor, uint16_t rem);
+	void (*unload)(usbh_baseclassdriver_t *drv);
+};
+
+struct usbh_classdriverinfo {
+	int16_t class;
+	int16_t subclass;
+	int16_t protocol;
+	const char *name;
+	const usbh_classdriver_vmt_t *vmt;
+};
+
+#define _usbh_base_classdriver_data		\
+	const usbh_classdriverinfo_t *info;	\
+	usbh_device_t *dev;					\
+	usbh_baseclassdriver_t *next;
+
+struct usbh_baseclassdriver {
+	_usbh_base_classdriver_data
+};
+
+
+/*===========================================================================*/
+/* Helper functions.				                                         */
+/*===========================================================================*/
+#include <usbh/desciter.h>	/* descriptor iterators */
+#include <usbh/debug.h>		/* debug */
+
+#endif
+
+#endif /* USBH_H_ */
diff --git a/os/hal/include/usbh/debug.h b/os/hal/include/usbh/debug.h
index 219eeb1..5120121 100644
--- a/os/hal/include/usbh/debug.h
+++ b/os/hal/include/usbh/debug.h
@@ -19,7 +19,7 @@
 #ifndef USBH_DEBUG_H_

 #define USBH_DEBUG_H_

 

-#include "usbh.h"

+#include "hal_usbh.h"

 

 #if HAL_USE_USBH

 

diff --git a/os/hal/include/usbh/dev/ftdi.h b/os/hal/include/usbh/dev/ftdi.h
index 678a521..ad6b4cd 100644
--- a/os/hal/include/usbh/dev/ftdi.h
+++ b/os/hal/include/usbh/dev/ftdi.h
@@ -18,7 +18,7 @@
 #ifndef USBH_FTDI_H_

 #define USBH_FTDI_H_

 

-#include "usbh.h"

+#include "hal_usbh.h"

 

 #if HAL_USE_USBH && HAL_USBH_USE_FTDI

 

diff --git a/os/hal/include/usbh/dev/hub.h b/os/hal/include/usbh/dev/hub.h
index 28a0681..07e88e6 100644
--- a/os/hal/include/usbh/dev/hub.h
+++ b/os/hal/include/usbh/dev/hub.h
@@ -18,7 +18,7 @@
 #ifndef USBH_HUB_H_

 #define USBH_HUB_H_

 

-#include "usbh.h"

+#include "hal_usbh.h"

 

 #if HAL_USE_USBH

 #if HAL_USBH_USE_HUB

diff --git a/os/hal/include/usbh/dev/msd.h b/os/hal/include/usbh/dev/msd.h
index 2ca8817..d164618 100644
--- a/os/hal/include/usbh/dev/msd.h
+++ b/os/hal/include/usbh/dev/msd.h
@@ -18,7 +18,7 @@
 #ifndef USBH_MSD_H_

 #define USBH_MSD_H_

 

-#include "usbh.h"

+#include "hal_usbh.h"

 

 #if HAL_USE_USBH && HAL_USBH_USE_MSD

 

diff --git a/os/hal/include/usbh/internal.h b/os/hal/include/usbh/internal.h
index 6811e20..baa477f 100644
--- a/os/hal/include/usbh/internal.h
+++ b/os/hal/include/usbh/internal.h
@@ -18,7 +18,7 @@
 #ifndef USBH_INTERNAL_H_

 #define USBH_INTERNAL_H_

 

-#include "usbh.h"

+#include "hal_usbh.h"

 

 #if HAL_USE_USBH