From b87cafd10e1c63d0c41ef54c0039c82a2d0c44b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= Date: Sun, 23 Jul 2017 00:53:27 +0200 Subject: [PATCH] Extract system properties as enums. --- right/src/usb_protocol_handler.c | 8 ++++---- right/src/usb_protocol_handler.h | 11 +++++++---- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/right/src/usb_protocol_handler.c b/right/src/usb_protocol_handler.c index 8c44df0..77809e9 100644 --- a/right/src/usb_protocol_handler.c +++ b/right/src/usb_protocol_handler.c @@ -99,16 +99,16 @@ void getSystemProperty() { uint8_t propertyId = GenericHidInBuffer[1]; switch (propertyId) { - case SYSTEM_PROPERTY_USB_PROTOCOL_VERSION_ID: + case SystemProperty_UsbProtocolVersionId: SetResponseByte(SYSTEM_PROPERTY_USB_PROTOCOL_VERSION); break; - case SYSTEM_PROPERTY_BRIDGE_PROTOCOL_VERSION_ID: + case SystemProperty_BridgeProtocolVersionId: SetResponseByte(SYSTEM_PROPERTY_BRIDGE_PROTOCOL_VERSION); break; - case SYSTEM_PROPERTY_DATA_MODEL_VERSION_ID: + case SystemProperty_DataModelVersionId: SetResponseByte(SYSTEM_PROPERTY_DATA_MODEL_VERSION); break; - case SYSTEM_PROPERTY_FIRMWARE_VERSION_ID: + case SystemProperty_FirmwareVersionId: SetResponseByte(SYSTEM_PROPERTY_FIRMWARE_VERSION); break; default: diff --git a/right/src/usb_protocol_handler.h b/right/src/usb_protocol_handler.h index 3924365..26808c5 100644 --- a/right/src/usb_protocol_handler.h +++ b/right/src/usb_protocol_handler.h @@ -10,10 +10,6 @@ #define PROTOCOL_RESPONSE_SUCCESS 0 #define PROTOCOL_RESPONSE_GENERIC_ERROR 1 - #define SYSTEM_PROPERTY_USB_PROTOCOL_VERSION_ID 0 - #define SYSTEM_PROPERTY_BRIDGE_PROTOCOL_VERSION_ID 1 - #define SYSTEM_PROPERTY_DATA_MODEL_VERSION_ID 2 - #define SYSTEM_PROPERTY_FIRMWARE_VERSION_ID 3 #define WRITE_LED_DRIVER_RESPONSE_INVALID_ADDRESS 1 #define WRITE_LED_DRIVER_RESPONSE_INVALID_PAYLOAD_SIZE 2 #define WRITE_EEPROM_RESPONSE_INVALID_PAYLOAD_SIZE 1 @@ -36,6 +32,13 @@ UsbCommand_LaunchEepromTransfer = 12, } usb_command_t; + typedef enum { + SystemProperty_UsbProtocolVersionId = 0, + SystemProperty_BridgeProtocolVersionId = 1, + SystemProperty_DataModelVersionId = 2, + SystemProperty_FirmwareVersionId = 3, + } system_property_t; + // Functions: extern void usbProtocolHandler();