refractor tusb_descriptors

usbd device_class_driver
added & tested HID mouse for device (work together with hid keyboard)
rename DEVICE_ROM_REG_BASE, DEVICE_ROM_DRIVER_ADDR

2 files changed, 27 insertions, 3 deletions

diff --git a/tests/test/device/usbd/test_usbd.c b/tests/test/device/usbd/test_usbd.c
index 66010375f..5e2282344 100644
--- a/tests/test/device/usbd/test_usbd.c
+++ b/tests/test/device/usbd/test_usbd.c
@@ -64,10 +64,34 @@ void test_dcd_init_failed(void)
   TEST_ASSERT_EQUAL( TUSB_ERROR_FAILED, usbd_init() );
 }
 
+tusb_error_t stub_hidd_init(tusb_descriptor_interface_t const* p_interface_desc, uint16_t* p_length, int num_call)
+{
+  switch(num_call)
+  {
+    case 0:
+      TEST_ASSERT_EQUAL_HEX32(&app_tusb_desc_configuration.keyboard_interface, p_interface_desc);
+    break;
+
+    case 1:
+      TEST_ASSERT_EQUAL_HEX32(&app_tusb_desc_configuration.mouse_interface, p_interface_desc);
+    break;
+
+    case 2:
+    break;
+
+    default:
+      TEST_FAIL();
+      return TUSB_ERROR_HIDD_DESCRIPTOR_INTERFACE;
+  }
+
+  return TUSB_ERROR_NONE;
+}
+
 void test_usbd_init_ok(void)
 {
   dcd_init_ExpectAndReturn(TUSB_ERROR_NONE);
-  hidd_init_ExpectAndReturn(&app_tusb_desc_configuration.keyboard_interface, TUSB_ERROR_NONE);
+
+  hidd_init_StubWithCallback(stub_hidd_init);
 
   dcd_controller_connect_Expect(0);
 
diff --git a/tests/test/support/tusb_config.h b/tests/test/support/tusb_config.h
index 7498c717e..6edd59800 100644
--- a/tests/test/support/tusb_config.h
+++ b/tests/test/support/tusb_config.h
@@ -97,10 +97,10 @@
 
 //------------- CLASS -------------//
 #define TUSB_CFG_DEVICE_HID_KEYBOARD  1
-#define TUSB_CFG_DEVICE_HID_MOUSE     0
+#define TUSB_CFG_DEVICE_HID_MOUSE     1
 #define TUSB_CFG_DEVICE_HID_GENERIC   0
 #define TUSB_CFG_DEVICE_MSC           0
-//#define TUSB_CFG_DEVICE_CDC
+#define TUSB_CFG_DEVICE_CDC           0
 
 //--------------------------------------------------------------------+
 // COMMON CONFIGURATION