uhk/firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename slave_handler_t to slave_updater_t and uhk_slave_t.slaveHandler to uhk_slave_t.updater

Browse Source
This commit is contained in:
László Monda
2017-05-05 02:26:48 +02:00
parent bbf937ff07
commit 32e1b8e17f
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
right/src/slave_scheduler.c
View File

@@ -16,9 +16,9 @@ slave_driver_initializer_t slaveDriverInitializers[] = {
}; };
uhk_slave_t slaves[] = { uhk_slave_t slaves[] = {
{ .slaveHandler = UhkModuleSlaveDriver_Update, .moduleId = 0 }, { .updater = UhkModuleSlaveDriver_Update, .moduleId = 0 },
{ .slaveHandler = LedSlaveDriver_Update, .moduleId = 0 }, { .updater = LedSlaveDriver_Update, .moduleId = 0 },
{ .slaveHandler = LedSlaveDriver_Update, .moduleId = 1 }, { .updater = LedSlaveDriver_Update, .moduleId = 1 },
}; };
static void bridgeProtocolCallback(I2C_Type *base, i2c_master_handle_t *handle, status_t status, void *userData) static void bridgeProtocolCallback(I2C_Type *base, i2c_master_handle_t *handle, status_t status, void *userData)
@@ -28,7 +28,7 @@ static void bridgeProtocolCallback(I2C_Type *base, i2c_master_handle_t *handle,
} }
uhk_slave_t *bridgeSlave = slaves + currentBridgeSlaveId; uhk_slave_t *bridgeSlave = slaves + currentBridgeSlaveId;
bridgeSlave->slaveHandler(bridgeSlave->moduleId); bridgeSlave->updater(bridgeSlave->moduleId);
currentBridgeSlaveId++; currentBridgeSlaveId++;
if (currentBridgeSlaveId >= (sizeof(slaves) / sizeof(uhk_slave_t))) { if (currentBridgeSlaveId >= (sizeof(slaves) / sizeof(uhk_slave_t))) {
@@ -49,5 +49,5 @@ void InitSlaveScheduler()
I2C_MasterTransferCreateHandle(I2C_MAIN_BUS_BASEADDR, &I2cMasterHandle, bridgeProtocolCallback, NULL); I2C_MasterTransferCreateHandle(I2C_MAIN_BUS_BASEADDR, &I2cMasterHandle, bridgeProtocolCallback, NULL);
// Kickstart the scheduler by triggering the first callback. // Kickstart the scheduler by triggering the first callback.
slaves[0].slaveHandler(slaves[0].moduleId); slaves[0].updater(slaves[0].moduleId);
} }

4
right/src/slave_scheduler.h
View File

@@ -13,12 +13,12 @@
UhkSlaveType_Touchpad UhkSlaveType_Touchpad
} uhk_slave_type_t; } uhk_slave_type_t;
typedef void (slave_handler_t)(uint8_t); typedef void (slave_updater_t)(uint8_t);
typedef void (*slave_driver_initializer_t)(); typedef void (*slave_driver_initializer_t)();
typedef struct { typedef struct {
uint8_t moduleId; // This is a unique, per-module ID. uint8_t moduleId; // This is a unique, per-module ID.
slave_handler_t *slaveHandler; slave_updater_t *updater;
bool isConnected; bool isConnected;
} uhk_slave_t; } uhk_slave_t;