diff --git a/include/nuttx/usb/usb_storage.h b/include/nuttx/usb/usb_storage.h
index 1803ee9f0a9a18f5a46133fe00b0a9bc5ea134c7..0ff1d9a38d1c0fbeda86b6b47632f4bb3562b24f 100644
--- a/include/nuttx/usb/usb_storage.h
+++ b/include/nuttx/usb/usb_storage.h
@@ -120,18 +120,10 @@ struct usbstrg_csw_s
uint8_t status; /* Status of transfer */
};
-/************************************************************************************
- * Private Data
- ************************************************************************************/
-
/************************************************************************************
* Public Data
************************************************************************************/
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
/************************************************************************************
* Public Functions
************************************************************************************/
diff --git a/include/nuttx/usb/usbhost.h b/include/nuttx/usb/usbhost.h
index 680ce5c1ffb47dfe4f6d262e2276debd0ddbff44..8678431705695d9c97f7c108d8c4bfb3896806e0 100644
--- a/include/nuttx/usb/usbhost.h
+++ b/include/nuttx/usb/usbhost.h
@@ -55,23 +55,145 @@
************************************************************************************/
/************************************************************************************
- * Public Types
+ * Name: CLASS_CREATE
+ *
+ * Description:
+ * This macro will call the create() method of struct usb_registry_s. The create()
+ * method is a callback into the class implementation. It is used to (1) create
+ * a new instance of the USB host class state and to (2) bind a USB host driver
+ * "session" to the class instance. Use of this create() method will support
+ * environments where there may be multiple USB ports and multiple USB devices
+ * simultaneously connected.
+ *
+ * Input Parameters:
+ * reg - The USB host class registry entry previously obtained from a call to
+ * usbhost_findclass().
+ * drvr - An instance of struct usbhost_driver_s that the class implementation will
+ * "bind" to its state structure and will subsequently use to communicate with
+ * the USB host driver.
+ *
+ * Returned Values:
+ * On success, this function will return a non-NULL instance of struct
+ * usbhost_class_s that can be used by the USB host driver to communicate with the
+ * USB host class. NULL is returned on failure; this function will fail only if
+ * the drvr input parameter is NULL or if there are insufficient resources to
+ * create another USB host class instance.
+ *
************************************************************************************/
+#definei CLASS_CREATE(reg, drvr) (reg->create(drvr))
+
/************************************************************************************
- * Private Data
+ * Public Types
************************************************************************************/
+/* This struct contains all of the information that is needed to associate a device
+ * this is connected via a USB port to a class.
+ */
+
+struct usbhost_id_s
+{
+ uint8_t class; /* Device class code (see USB_CLASS_* defines in usb.h) */
+ uint16_t vid; /* Vendor ID (for vendor/product specific devices) */
+ uint16_t pid; /* Product ID (for vendor/product specific devices) */
+};
+
+/* The struct usbhost_registry_s type describes information that is kept in the the
+ * USB host registry. USB host class implementations register this information so
+ * that USB host drivers can later find the class that matches the device that is
+ * connected to the USB port.
+ */
+
+struct usbhost_driver_s; /* Forward reference to the driver state structure */
+struct usbhost_class_s; /* Forward reference to the class state structure */
+struct usbhost_registry_s
+{
+ /* This field is used to implement a singly-link registry structure. Because of
+ * the presence of this link, provides of structy usbhost_registry_s instances must
+ * provide those instances in write-able memory (RAM).
+ */
+
+ struct usbhsot_registry_s flink;
+
+ /* This is a callback into the class implementation. It is used to (1) create
+ * a new instance of the USB host class state and to (2) bind a USB host driver
+ * "session" to the class instance. Use of this create() method will support
+ * environments where there may be multiple USB ports and multiple USB devices
+ * simultaneously connected (see the CLASS_CREATE() macro above).
+ */
+
+ struct usbhost_class_s *(*create)(struct usbhost_driver_s *drvr);
+
+ /* This information uniquely identifies the USB host class implementation that
+ * goes with a specific USB device.
+ */
+
+ struct usbhost_id_s id;
+};
+
/************************************************************************************
* Public Data
************************************************************************************/
/************************************************************************************
- * Private Functions
+ * Public Functions
+ ************************************************************************************/
+
+#undef EXTERN
+#if defined(__cplusplus)
+#define EXTERN extern "C"
+extern "C" {
+#else
+#define EXTERN extern
+#endif
+
+/************************************************************************************
+ * Name: usbhost_registerclass
+ *
+ * Description:
+ * Register a USB host class implementation. The caller provides an instance of
+ * struct usbhost_registry_s that contains all of the information that will be
+ * needed later to (1) associate the USB host class implementation with a connected
+ * USB device, and (2) to obtain and bind a struct usbhost_class_s instance for
+ * the device.
+ *
+ * Input Parameters:
+ * class - An write-able instance of struct usbhost_registry_s that will be
+ * maintained in a registry.
+ *
+ * Returned Values:
+ * On success, this function will return zero (OK). Otherwise, a negated errno
+ * value is returned.
+ *
************************************************************************************/
+EXTERN int usbhost_registerclass(struct usbhost_registry_s *class);
+
/************************************************************************************
- * Public Functions
+ * Name: usbhost_findclass
+ *
+ * Description:
+ * Find a USB host class implementation previously registered by
+ * usbhost_registerclass(). On success, an instance of struct usbhost_registry_s
+ * will be returned. That instance will contain all of the information that will
+ * be needed to obtain and bind a struct usbhost_class_s instance for the device.
+ *
+ * Input Parameters:
+ * id - Identifies the USB device class that has connect to the USB host.
+ *
+ * Returned Values:
+ * On success this function will return a non-NULL instance of struct
+ * usbhost_registry_s. NULL will be returned on failure. This function can only
+ * fail if (1) id is NULL, or (2) no USB host class is registered that matches the
+ * device class ID.
+ *
************************************************************************************/
+EXTERN const struct usbhost_registry_s *usbhost_findclass(const struct usbhost_id_s *id);
+
+#undef EXTERN
+#if defined(__cplusplus)
+}
+#endif
+
#endif /* __NUTTX_USB_USBHOST_H */