moved hid descriptors hid file

Author: itzandroidtab

klib/usb/cdc/descriptor.hpp

@@ -54,7 +54,7 @@ namespace klib::usb::cdc::detail {
         const uint8_t bFunctionLength = sizeof(Base);
 
         // descriptor type (CS_INTERFACE)
-        const uint8_t bDescriptorType = 0x24;
+        const descriptor::descriptor_type bDescriptorType = descriptor::descriptor_type::cs_interface;
 
         // header functional descriptor subtype
         const uint8_t bDescriptorSubtype = static_cast<uint8_t>(SubType);

klib/usb/descriptor.hpp

@@ -65,6 +65,8 @@ namespace klib::usb::descriptor {
         interface_association = 11,
         bos = 15,
         device_capability = 16,
+        cs_interface = 36,
+        cs_endpoint = 37,
         superspeed_usb_endpoint_compainion = 48,
     };
 
@@ -118,7 +120,7 @@ namespace klib::usb::descriptor {
         const uint8_t bLength = sizeof(device);
 
         // descriptorType
-        const uint8_t bDescriptionType = static_cast<uint8_t>(descriptor_type::device);
+        const descriptor_type bDescriptionType = descriptor_type::device;
 
         // usb specification number which device compies to
         uint16_t bcdUSB;
@@ -169,7 +171,7 @@ namespace klib::usb::descriptor {
         const uint8_t bLength = sizeof(configuration);
 
         // descriptorType
-        const uint8_t bDescriptionType = static_cast<uint8_t>(descriptor_type::configuration);
+        const descriptor_type bDescriptionType = descriptor_type::configuration;
 
         // total length in bytes of data returned
         uint16_t wTotalLength;
@@ -220,7 +222,7 @@ namespace klib::usb::descriptor {
         const uint8_t bLength = sizeof(string<Size>);
 
         // descriptorType
-        const uint8_t bDescriptionType = static_cast<uint8_t>(descriptor_type::string);
+        const descriptor_type bDescriptionType = descriptor_type::string;
 
         // unicode encoded string
         char16_t bString[Size];
@@ -239,7 +241,7 @@ namespace klib::usb::descriptor {
         const uint8_t bLength = sizeof(interface);
 
         // descriptorType
-        const uint8_t bDescriptionType = static_cast<uint8_t>(descriptor_type::interface);
+        const descriptor_type bDescriptionType = descriptor_type::interface;
 
         // number of interface
         uint8_t bInterfaceNumber;
@@ -277,7 +279,7 @@ namespace klib::usb::descriptor {
         const uint8_t bLength = sizeof(endpoint);
 
         // descriptorType
-        const uint8_t bDescriptionType = static_cast<uint8_t>(descriptor_type::endpoint);
+        const descriptor_type bDescriptionType = descriptor_type::endpoint;
 
         // endpoint address
         // b[0..3] = endpoint number
@@ -327,7 +329,7 @@ namespace klib::usb::descriptor {
         const uint8_t bLength = sizeof(qualifier);
 
         // descriptorType
-        const uint8_t bDescriptionType = static_cast<uint8_t>(descriptor_type::device_qualifier);
+        const descriptor_type bDescriptionType = descriptor_type::device_qualifier;
 
         // usb specification number which device compies to
         uint16_t bcdUSB;
@@ -362,7 +364,7 @@ namespace klib::usb::descriptor {
         const uint8_t bLength = sizeof(bos);
 
         // the BOS descriptor type
-        const uint8_t bDescriptorType = static_cast<uint8_t>(descriptor_type::bos);
+        const descriptor_type bDescriptorType = descriptor_type::bos;
 
         // the length of this descriptor and all of
         // its sub descriptors
@@ -386,7 +388,7 @@ namespace klib::usb::descriptor {
         const uint8_t bLength = sizeof(capability<T>);
 
         // the device capability descriptor type
-        const uint8_t bDescriptorType = static_cast<uint8_t>(descriptor_type::device_capability);
+        const descriptor_type bDescriptorType = descriptor_type::device_capability;
 
         // device capability type (valid values are
         // listed in table 9-11)
@@ -407,7 +409,7 @@ namespace klib::usb::descriptor {
         const uint8_t bLength = sizeof(interface_association);
 
         // the device capability descriptor type
-        const uint8_t bDescriptorType = static_cast<uint8_t>(descriptor_type::interface_association);
+        const descriptor_type bDescriptorType = descriptor_type::interface_association;
 
         // first interface number of the next
         // descriptor

klib/usb/device/keyboard.hpp

@@ -23,15 +23,6 @@ namespace klib::usb::device {
             serial = 3
         };
 
-        /**
-         * @brief Class specific descriptors
-         *
-         */
-        enum class class_type {
-            hid = 0x21,
-            report = 0x22
-        };
-
         /**
          * @brief Class specific requests for the handle class packet function
          *
@@ -136,11 +127,11 @@ namespace klib::usb::device {
                 .iInterface = 0x00
             },
             {
-                .bDescriptorType = 0x21,
+                .bDescriptorType = hid::class_type::hid,
                 .bcdHID = 0x0110,
                 .bCountryCode = 0x00,
                 .bNumDescriptors = 0x01,
-                .bClassDescriptorType = static_cast<uint8_t>(class_type::report),
+                .bClassDescriptorType = hid::class_type::report,
                 .wDescriptorLength = sizeof(report)
             },
             {
@@ -554,11 +545,11 @@ namespace klib::usb::device {
             }
 
             // check if we have a class specific descriptor
-            switch (static_cast<class_type>(type)) {
-                case class_type::hid:
+            switch (static_cast<hid::class_type>(type)) {
+                case hid::class_type::hid:
                     // return the hid descriptor only
                     return to_description(config.hid, config.hid.bLength);
-                case class_type::report:
+                case hid::class_type::report:
                     // return the raw report.
                     return to_description(report, sizeof(report));
                 default:

klib/usb/device/mouse.hpp

@@ -23,15 +23,6 @@ namespace klib::usb::device {
             serial = 3
         };
 
-        /**
-         * @brief Class specific descriptors
-         *
-         */
-        enum class class_type {
-            hid = 0x21,
-            report = 0x22
-        };
-
         /**
          * @brief Class specific requests for the handle class packet function
          *
@@ -137,11 +128,11 @@ namespace klib::usb::device {
                 .iInterface = 0x00
             },
             {
-                .bDescriptorType = 0x21,
+                .bDescriptorType = hid::class_type::hid,
                 .bcdHID = 0x0110,
                 .bCountryCode = 0x00,
                 .bNumDescriptors = 0x01,
-                .bClassDescriptorType = static_cast<uint8_t>(class_type::report),
+                .bClassDescriptorType = hid::class_type::report,
                 .wDescriptorLength = sizeof(report)
             },
             {
@@ -389,11 +380,11 @@ namespace klib::usb::device {
             }
 
             // check if we have a class specific descriptor
-            switch (static_cast<class_type>(type)) {
-                case class_type::hid:
+            switch (static_cast<hid::class_type>(type)) {
+                case hid::class_type::hid:
                     // return the hid descriptor only
                     return to_description(config.hid, config.hid.bLength);
-                case class_type::report:
+                case hid::class_type::report:
                     // return the raw report.
                     return to_description(report, sizeof(report));
                 default:

klib/usb/hid/descriptor.hpp

@@ -8,6 +8,16 @@
 #pragma pack(push, 1)
 
 namespace klib::usb::hid {
+    /**
+     * @brief Class specific descriptors
+     *
+     */
+    enum class class_type: uint8_t {
+        hid = 0x21,
+        report = 0x22,
+        pyhisical = 0x23
+    };
+
     /**
      * @brief Hid device descriptor
      *
@@ -17,7 +27,7 @@ namespace klib::usb::hid {
         const uint8_t bLength = sizeof(descriptor);
 
         // descriptor type
-        uint8_t bDescriptorType;
+        class_type bDescriptorType;
 
         // Hid class specification number which device complies to
         uint16_t bcdHID;
@@ -29,7 +39,7 @@ namespace klib::usb::hid {
         uint8_t bNumDescriptors;
 
         // report descriptor type
-        uint8_t bClassDescriptorType;
+        class_type bClassDescriptorType;
 
         // total length of the report descriptor
         uint16_t wDescriptorLength;