[nrf fromtree] usb: device_next: fail on initialization if no HID device is registered

Do not register the device when the class instance has already been
initialised. Fail on initialization if no HID device is registered.

Signed-off-by: Johann Fischer <[email protected]>
(cherry picked from commit c62575e)

Author: jfischer-no

subsys/usb/device_next/class/usbd_hid.c

@@ -57,6 +57,7 @@ struct usbd_hid_descriptor {
 };
 
 enum {
+	HID_DEV_CLASS_INITIALIZED,
 	HID_DEV_CLASS_ENABLED,
 };
 
@@ -503,7 +504,14 @@ static int usbd_hid_init(struct usbd_class_data *const c_data)
 	const struct device *dev = usbd_class_get_private(c_data);
 	const struct hid_device_config *dcfg = dev->config;
 	struct usbd_hid_descriptor *const desc = dcfg->desc;
+	struct hid_device_data *const ddata = dev->data;
+
+	if (ddata->ops == NULL ||  ddata->rdesc == NULL || !ddata->rsize) {
+		LOG_ERR("HID device does not seem to be registered");
+		return -EINVAL;
+	}
 
+	atomic_set_bit(&ddata->state, HID_DEV_CLASS_INITIALIZED);
 	LOG_DBG("HID class %s init", c_data->name);
 
 	if (dcfg->if_desc_data != NULL && desc->if0.iInterface == 0) {
@@ -519,6 +527,10 @@ static int usbd_hid_init(struct usbd_class_data *const c_data)
 
 static void usbd_hid_shutdown(struct usbd_class_data *const c_data)
 {
+	const struct device *dev = usbd_class_get_private(c_data);
+	struct hid_device_data *const ddata = dev->data;
+
+	atomic_clear_bit(&ddata->state, HID_DEV_CLASS_INITIALIZED);
 	LOG_DBG("HID class %s shutdown", c_data->name);
 }
 
@@ -628,7 +640,7 @@ static int hid_dev_register(const struct device *dev,
 	struct hid_device_data *const ddata = dev->data;
 	struct usbd_hid_descriptor *const desc = dcfg->desc;
 
-	if (atomic_test_bit(&ddata->state, HID_DEV_CLASS_ENABLED)) {
+	if (atomic_test_bit(&ddata->state, HID_DEV_CLASS_INITIALIZED)) {
 		return -EALREADY;
 	}