Merge branch 'develop' of https://github.com/ARM-software/CMSIS_5 into develop
diff --git a/CMSIS/Driver/DriverTemplates/Driver_USBH.c b/CMSIS/Driver/DriverTemplates/Driver_USBH.c
index e947f8c..1ef3c5f 100644
--- a/CMSIS/Driver/DriverTemplates/Driver_USBH.c
+++ b/CMSIS/Driver/DriverTemplates/Driver_USBH.c
@@ -41,24 +41,26 @@
// Functions
//
-ARM_DRIVER_VERSION ARM_USBH_GetVersion(void)
+static ARM_DRIVER_VERSION ARM_USBH_GetVersion(void)
+{
+ return usbh_driver_version;
+}
+
+static ARM_USBH_CAPABILITIES ARM_USBH_GetCapabilities(void)
+{
+ return usbd_driver_capabilities;
+}
+
+static int32_t ARM_USBH_Initialize(ARM_USBH_SignalPortEvent_t cb_port_event,
+ ARM_USBH_SignalPipeEvent_t cb_pipe_event)
{
}
-ARM_USBH_CAPABILITIES ARM_USBH_GetCapabilities(void)
+static int32_t ARM_USBH_Uninitialize(void)
{
}
-int32_t ARM_USBH_Initialize(ARM_USBH_SignalPortEvent_t cb_port_event,
- ARM_USBH_SignalEndpointEvent_t cb_endpoint_event)
-{
-}
-
-int32_t ARM_USBH_Uninitialize(void)
-{
-}
-
-int32_t ARM_USBH_PowerControl(ARM_POWER_STATE state)
+static int32_t ARM_USBH_PowerControl(ARM_POWER_STATE state)
{
switch (state)
{
@@ -76,150 +78,103 @@
}
}
-int32_t ARM_USBH_PortVbusOnOff(uint8_t port, bool vbus)
+static int32_t ARM_USBH_PortVbusOnOff(uint8_t port, bool vbus)
{
}
-int32_t ARM_USBH_PortReset(uint8_t port)
+static int32_t ARM_USBH_PortReset(uint8_t port)
{
}
-int32_t ARM_USBH_PortSuspend(uint8_t port)
+static int32_t ARM_USBH_PortSuspend(uint8_t port)
{
}
-int32_t ARM_USBH_PortResume(uint8_t port)
+static int32_t ARM_USBH_PortResume(uint8_t port)
{
}
-ARM_USBH_PORT_STATE ARM_USBH_PortGetState(uint8_t port)
+static ARM_USBH_PORT_STATE ARM_USBH_PortGetState(uint8_t port)
{
}
-ARM_USBH_EP_HANDLE ARM_USBH_EndpointCreate(uint8_t dev_addr,
- uint8_t dev_speed,
- uint8_t hub_addr,
- uint8_t hub_port,
- uint8_t ep_addr,
- uint8_t ep_type,
- uint16_t ep_max_packet_size,
- uint8_t ep_interval)
+static ARM_USBH_PIPE_HANDLE ARM_USBH_PipeCreate(uint8_t dev_addr,
+ uint8_t dev_speed,
+ uint8_t hub_addr,
+ uint8_t hub_port,
+ uint8_t ep_addr,
+ uint8_t ep_type,
+ uint16_t ep_max_packet_size,
+ uint8_t ep_interval)
{
}
-int32_t ARM_USBH_EndpointModify(ARM_USBH_EP_HANDLE ep_hndl,
- uint8_t dev_addr,
- uint8_t dev_speed,
- uint8_t hub_addr,
- uint8_t hub_port,
- uint16_t ep_max_packet_size)
+static int32_t ARM_USBH_PipeModify(ARM_USBH_PIPE_HANDLE pipe_hndl,
+ uint8_t dev_addr,
+ uint8_t dev_speed,
+ uint8_t hub_addr,
+ uint8_t hub_port,
+ uint16_t ep_max_packet_size)
{
}
-int32_t ARM_USBH_EndpointDelete(ARM_USBH_EP_HANDLE ep_hndl)
+static int32_t ARM_USBH_PipeDelete(ARM_USBH_PIPE_HANDLE pipe_hndl)
{
}
-int32_t ARM_USBH_EndpointReset(ARM_USBH_EP_HANDLE ep_hndl)
+static int32_t ARM_USBH_PipeReset(ARM_USBH_PIPE_HANDLE pipe_hndl)
{
}
-int32_t ARM_USBH_EndpointTransfer(ARM_USBH_EP_HANDLE ep_hndl,
- uint32_t packet,
- uint8_t *data,
- uint32_t num)
+static int32_t ARM_USBH_PipeTransfer(ARM_USBH_PIPE_HANDLE pipe_hndl,
+ uint32_t packet,
+ uint8_t *data,
+ uint32_t num)
{
}
-uint32_t ARM_USBH_EndpointTransferGetResult(ARM_USBH_EP_HANDLE ep_hndl)
+static uint32_t ARM_USBH_PipeTransferGetResult(ARM_USBH_PIPE_HANDLE pipe_hndl)
{
}
-int32_t ARM_USBH_EndpointTransferAbort(ARM_USBH_EP_HANDLE ep_hndl)
+static int32_t ARM_USBH_PipeTransferAbort(ARM_USBH_PIPE_HANDLE pipe_hndl)
{
}
-uint16_t ARM_USBH_GetFrameNumber(void)
+static uint16_t ARM_USBH_GetFrameNumber(void)
{
}
-void ARM_USBH_SignalPortEvent(uint8_t port, uint32_t event)
+static void ARM_USBH_SignalPortEvent(uint8_t port, uint32_t event)
{
// function body
}
-void ARM_USBH_SignalEndpointEvent(ARM_USBH_EP_HANDLE ep_hndl, uint32_t event)
-{
- // function body
-}
-
-/* USB Host HCI (OHCI/EHCI) Driver */
-
-/* Driver Version */
-static const ARM_DRIVER_VERSION usbh_hci_driver_version = {
- ARM_USBH_API_VERSION,
- ARM_USBH_DRV_VERSION
-};
-
-/* Driver Capabilities */
-static const ARM_USBH_HCI_CAPABILITIES usbh_hci_driver_capabilities = {
- 0x0001 /* Root HUB available Ports Mask */
-};
-
-//
-// Functions
-//
-
-ARM_DRIVER_VERSION ARM_USBH_HCI_GetVersion(void)
-{
-}
-
-ARM_USBH_HCI_CAPABILITIES ARM_USBH_HCI_GetCapabilities(void)
-{
-}
-
-int32_t ARM_USBH_HCI_Initialize(ARM_USBH_HCI_Interrupt_t cb_interrupt)
-{
-}
-
-int32_t ARM_USBH_HCI_Uninitialize(void)
-{
-}
-
-int32_t ARM_USBH_HCI_PowerControl(ARM_POWER_STATE state)
-{
- switch (state)
- {
- case ARM_POWER_OFF:
- break;
-
- case ARM_POWER_LOW:
- break;
-
- case ARM_POWER_FULL:
- break;
-
- default:
- return ARM_DRIVER_ERROR_UNSUPPORTED;
- }
-}
-
-int32_t ARM_USBH_HCI_PortVbusOnOff(uint8_t port, bool vbus)
-{
-}
-
-void ARM_USBH_HCI_Interrupt(void)
+static void ARM_USBH_SignalPipeEvent(ARM_USBH_PIPE_HANDLE pipe_hndl, uint32_t event)
{
// function body
}
// End USBH Interface
-ARM_DRIVER_USBH_HCI Driver_USBH_HCI = {
- ARM_USBH_HCI_GetVersion,
- ARM_USBH_HCI_GetCapabilities,
- ARM_USBH_HCI_Initialize,
- ARM_USBH_HCI_Uninitialize,
- ARM_USBH_HCI_PowerControl,
- ARM_USBH_HCI_PortVbusOnOff
+ARM_DRIVER_USBH Driver_USBH0 = {
+ ARM_USBH_GetVersion,
+ ARM_USBH_GetCapabilities,
+ ARM_USBH_Initialize,
+ ARM_USBH_Uninitialize,
+ ARM_USBH_PowerControl,
+ ARM_USBH_PortVbusOnOff,
+ ARM_USBH_PortReset,
+ ARM_USBH_PortSuspend,
+ ARM_USBH_PortResume,
+ ARM_USBH_PortGetState,
+ ARM_USBH_PipeCreate,
+ ARM_USBH_PipeModify,
+ ARM_USBH_PipeDelete,
+ ARM_USBH_PipeReset,
+ ARM_USBH_PipeTransfer,
+ ARM_USBH_PipeTransferGetResult,
+ ARM_USBH_PipeTransferAbort,
+ ARM_USBH_GetFrameNumber
};
+