Remove the unused _peripheral_control_interface.pollForActivity field.

This commit is contained in:
László Monda
2017-04-14 15:21:04 +02:00
parent fc202d8dde
commit 6441285e85
4 changed files with 4 additions and 9 deletions
-1
View File
@@ -34,7 +34,6 @@ typedef void (*serial_byte_receive_func_t)(uint8_t);
//! @brief Peripheral control interface. //! @brief Peripheral control interface.
typedef struct _peripheral_control_interface typedef struct _peripheral_control_interface
{ {
bool (*pollForActivity)(const peripheral_descriptor_t *self);
status_t (*init)(const peripheral_descriptor_t *self, serial_byte_receive_func_t function); status_t (*init)(const peripheral_descriptor_t *self, serial_byte_receive_func_t function);
void (*shutdown)(const peripheral_descriptor_t *self); void (*shutdown)(const peripheral_descriptor_t *self);
void (*pump)(const peripheral_descriptor_t *self); void (*pump)(const peripheral_descriptor_t *self);
+2 -1
View File
@@ -1,5 +1,6 @@
#include "usb_descriptor.h" #include "usb_descriptor.h"
#include "composite.h" #include "composite.h"
#include "peripherials/test_led.h"
extern usb_device_endpoint_struct_t g_hid_generic_endpoints[]; extern usb_device_endpoint_struct_t g_hid_generic_endpoints[];
static usb_device_composite_struct_t *g_device_composite; static usb_device_composite_struct_t *g_device_composite;
@@ -40,7 +41,7 @@ usb_status_t usb_device_hid_generic_callback(class_handle_t handle, uint32_t eve
g_device_composite->hid_generic.hid_packet.reportSize = hid_report_param->reportLength; g_device_composite->hid_generic.hid_packet.reportSize = hid_report_param->reportLength;
g_device_composite->hid_generic.hid_packet.didReceiveFirstReport = true; g_device_composite->hid_generic.hid_packet.didReceiveFirstReport = true;
TEST_LED_OFF();
// Wake up the read packet handler. // Wake up the read packet handler.
sync_signal(&g_device_composite->hid_generic.hid_packet.receiveSync); sync_signal(&g_device_composite->hid_generic.hid_packet.receiveSync);
error = kStatus_USB_Success; error = kStatus_USB_Success;
+2 -5
View File
@@ -19,8 +19,7 @@ static void init_i2c(uint32_t instance);
static bool s_dHidActivity = false; static bool s_dHidActivity = false;
const peripheral_control_interface_t g_usbHidControlInterface = {.pollForActivity = usb_hid_poll_for_activity, const peripheral_control_interface_t g_usbHidControlInterface = {.init = usb_device_full_init,
.init = usb_device_full_init,
.shutdown = usb_device_full_shutdown, .shutdown = usb_device_full_shutdown,
.pump = usb_msc_pump }; .pump = usb_msc_pump };
@@ -75,8 +74,7 @@ bool usb_clock_init(void)
bool usb_hid_poll_for_activity(const peripheral_descriptor_t *self) bool usb_hid_poll_for_activity(const peripheral_descriptor_t *self)
{ {
s_dHidActivity = g_device_composite.hid_generic.hid_packet.didReceiveFirstReport; return g_device_composite.attach && g_device_composite.hid_generic.hid_packet.didReceiveFirstReport;
return g_device_composite.attach && s_dHidActivity;
} }
usb_status_t usb_device_callback(usb_device_handle handle, uint32_t event, void *param) usb_status_t usb_device_callback(usb_device_handle handle, uint32_t event, void *param)
@@ -242,7 +240,6 @@ void usb_device_full_shutdown(const peripheral_descriptor_t *self)
void usb_msc_pump(const peripheral_descriptor_t *self) void usb_msc_pump(const peripheral_descriptor_t *self)
{ {
s_dHidActivity = true; s_dHidActivity = true;
TEST_LED_OFF();
} }
status_t usb_hid_packet_init(const peripheral_descriptor_t *self) status_t usb_hid_packet_init(const peripheral_descriptor_t *self)
-2
View File
@@ -34,7 +34,6 @@ void handleUsbBusPalCommand()
static void handle_config_i2c(uint8_t *packet, uint32_t packetLength) static void handle_config_i2c(uint8_t *packet, uint32_t packetLength)
{ {
// TEST_LED_OFF();
configure_i2c_packet_t *command = (configure_i2c_packet_t *)packet; configure_i2c_packet_t *command = (configure_i2c_packet_t *)packet;
configure_i2c_address(command->address); configure_i2c_address(command->address);
configure_i2c_speed(command->speed); configure_i2c_speed(command->speed);
@@ -394,7 +393,6 @@ status_t bootloader_command_pump()
debug_printf("Error: readPacket returned status 0x%x\r\n", status); debug_printf("Error: readPacket returned status 0x%x\r\n", status);
break; break;
} }
// TEST_LED_OFF();
if (g_commandData.packetLength == 0) if (g_commandData.packetLength == 0)
{ {