Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add HID classes #47

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions usb_protocol/emitters/descriptors/hid.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
import unittest

from contextlib import contextmanager

from .. import emitter_for_format
from ..descriptor import ComplexDescriptorEmitter
from ...types.descriptors.hid import *

class HIDDescriptorEmitter(ComplexDescriptorEmitter):

DESCRIPTOR_FORMAT = HIDDescriptor

@contextmanager
def ReportDescriptor(self):
""" Context manager that allows addition of a subordinate report descriptor.

It can be used with a `with` statement; and yields an HIDReportDescriptorEmitter
that can be populated:

with hiddescriptor.ReportDescriptor() as r:
r.wDescriptorLength = 0x10

This adds the relevant descriptor, automatically.
"""

descriptor = HIDReportDescriptorEmitter()
yield descriptor
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Similarly, I think ReportDescriptor should be changed to DescriptorReference throughout these lines.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good suggestion, applied it


self.add_subordinate_descriptor(descriptor)

def _pre_emit(self):
# Figure out the total length of our descriptor, including subordinates.
subordinate_length = sum(len(sub) for sub in self._subordinates)
self.bLength = subordinate_length + self.DESCRIPTOR_FORMAT.sizeof()
self.bNumDescriptors = len(self._subordinates)
pass


HIDReportDescriptorEmitter = emitter_for_format(HIDReportDescriptor)
45 changes: 45 additions & 0 deletions usb_protocol/types/descriptors/hid.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
#
# This file is part of usb-protocol.
#
""" Structures describing Human Interface Device Class descriptors. """

import unittest
from enum import IntEnum

from ..descriptor import \
DescriptorField, DescriptorNumber, DescriptorFormat

class HidInterfaceClassCodes(IntEnum):
HID = 0x03

class HidInterfaceSubclassCodes(IntEnum):
NO_SUBCLASS = 0
BOOT = 1

class HidInterfaceProtocols(IntEnum):
NONE = 0
KEYBOARD = 1
MOUSE = 2

class HidClassSpecificDescriptorTypes(IntEnum):
CS_UNDEFINED = 0x20
CS_HID = 0x21
CS_REPORT = 0x22
CS_PHYSICAL = 0x23


HIDDescriptor = DescriptorFormat(
"bLength" / DescriptorField("Descriptor Length"),
"bDescriptorType" / DescriptorNumber(HidClassSpecificDescriptorTypes.CS_HID),
"bcdHID" / DescriptorField("HID Protocol Version", default=1.11),
"bCountryCode" / DescriptorField("Hardware target country", default=0),
"bNumDescriptors" / DescriptorField("Number of HID class descriptors to follow", default=0),
)

# This is not reallyy a stand-alone descriptor, but it is part of the HIDDescriptor above.
# That descriptor can contain multiple ReportDescriptors. To support this, a seperate
# descriptor format is used.
HIDReportDescriptor = DescriptorFormat(
"bDescriptorType" / DescriptorField("HID Descriptor Type", default=HidClassSpecificDescriptorTypes.CS_REPORT),
"wDescriptorLength" / DescriptorField("HID Descriptor Length")
)
Copy link
Member

@martinling martinling Nov 4, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This type should be called something other than HIDReportDescriptor, because:

  1. At some point we're going to want that name for the actual HID report descriptor (i.e. type 0x22).

  2. A report descriptor is not the only thing that can appear here. The other descriptors listed by the HID descriptor are usually report descriptors, but the HID spec also specifies physical descriptors (0x23) that would appear here, and further types could be also be included in theory. As you note, this particular sub-format isn't really a descriptor. It's a reference to a descriptor that may be retrieved separately. So my suggestion for the name here would be HIDDescriptorReference.