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

Rename Slave .initializer to .init and .updater to .update

Browse Source
This commit is contained in:
László Monda
2017-08-19 13:00:17 +02:00
parent 992fea28ad
commit d22cb079b4
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
right/src/slave_scheduler.c
View File

@@ -13,9 +13,9 @@ uint8_t currentSlaveId = 0;
uint32_t BridgeCounter;
uhk_slave_t Slaves[] = {
{ .initializer = UhkModuleSlaveDriver_Init, .updater = UhkModuleSlaveDriver_Update, .perDriverId = UhkModuleId_LeftKeyboardHalf },
{ .initializer = LedSlaveDriver_Init, .updater = LedSlaveDriver_Update, .perDriverId = LedDriverId_Right },
{ .initializer = LedSlaveDriver_Init, .updater = LedSlaveDriver_Update, .perDriverId = LedDriverId_Left },
{ .init = UhkModuleSlaveDriver_Init, .update = UhkModuleSlaveDriver_Update, .perDriverId = UhkModuleId_LeftKeyboardHalf },
{ .init = LedSlaveDriver_Init, .update = LedSlaveDriver_Update, .perDriverId = LedDriverId_Right },
{ .init = LedSlaveDriver_Init, .update = LedSlaveDriver_Update, .perDriverId = LedDriverId_Left },
};
static void bridgeProtocolCallback(I2C_Type *base, i2c_master_handle_t *handle, status_t status, void *userData)
@@ -34,10 +34,10 @@ static void bridgeProtocolCallback(I2C_Type *base, i2c_master_handle_t *handle,
previousSlave->isConnected = status == kStatus_Success;
if (!currentSlave->isConnected) {
currentSlave->initializer(currentSlave->perDriverId);
currentSlave->init(currentSlave->perDriverId);
}
currentSlave->updater(currentSlave->perDriverId);
currentSlave->update(currentSlave->perDriverId);
if (IsI2cTransferScheduled) {
currentSlave->isConnected = true;
}
@@ -54,7 +54,7 @@ static void bridgeProtocolCallback(I2C_Type *base, i2c_master_handle_t *handle,
static void initSlaveDrivers()
{
for (uint8_t i=0; i<sizeof(Slaves) / sizeof(uhk_slave_t); i++) {
Slaves[i].initializer(Slaves[i].perDriverId);
Slaves[i].init(Slaves[i].perDriverId);
}
}
@@ -64,5 +64,5 @@ void InitSlaveScheduler()
I2C_MasterTransferCreateHandle(I2C_MAIN_BUS_BASEADDR, &I2cMasterHandle, bridgeProtocolCallback, NULL);
// Kickstart the scheduler by triggering the first callback.
Slaves[currentSlaveId].updater(Slaves[currentSlaveId].perDriverId);
Slaves[currentSlaveId].update(Slaves[currentSlaveId].perDriverId);
}

8
right/src/slave_scheduler.h
View File

@@ -13,13 +13,13 @@
SlaveId_LeftLedDriver,
} slave_id_t;
typedef void (slave_initializer_t)(uint8_t);
typedef void (slave_updater_t)(uint8_t);
typedef void (slave_init_t)(uint8_t);
typedef void (slave_update_t)(uint8_t);
typedef struct {
uint8_t perDriverId; // Identifies the slave instance on a per-driver basis
slave_initializer_t *initializer;
slave_updater_t *updater;
slave_init_t *init;
slave_update_t *update;
bool isConnected;
} uhk_slave_t;