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

Rename slaves to Slaves now that it's extern.

Browse Source
This commit is contained in:
László Monda
2017-06-01 11:01:49 +02:00
parent d0678bbb51
commit f8883e416d
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
right/src/slave_drivers/slave_driver_led_driver.c
+1 -1
View File
@@ -73,7 +73,7 @@ void LedSlaveDriver_Update(uint8_t ledDriverId) {
switch (*ledDriverPhase) { switch (*ledDriverPhase) {
case LedDriverPhase_SetFunctionFrame: case LedDriverPhase_SetFunctionFrame:
if (!slaves[SlaveId_LeftKeyboardHalf].isConnected) { if (!Slaves[SlaveId_LeftKeyboardHalf].isConnected) {
break; break;
} }
I2cAsyncWrite(ledDriverAddress, setFunctionFrameBuffer, sizeof(setFunctionFrameBuffer)); I2cAsyncWrite(ledDriverAddress, setFunctionFrameBuffer, sizeof(setFunctionFrameBuffer));
right/src/slave_scheduler.c
+6 -6
View File
@@ -10,7 +10,7 @@
uint8_t currentSlaveId = 0; uint8_t currentSlaveId = 0;
uhk_slave_t slaves[] = { uhk_slave_t Slaves[] = {
{ .initializer = UhkModuleSlaveDriver_Init, .updater = UhkModuleSlaveDriver_Update, .perDriverId = 0 }, { .initializer = UhkModuleSlaveDriver_Init, .updater = UhkModuleSlaveDriver_Update, .perDriverId = 0 },
{ .initializer = LedSlaveDriver_Init, .updater = LedSlaveDriver_Update, .perDriverId = 0 }, { .initializer = LedSlaveDriver_Init, .updater = LedSlaveDriver_Update, .perDriverId = 0 },
{ .initializer = LedSlaveDriver_Init, .updater = LedSlaveDriver_Update, .perDriverId = 1 }, { .initializer = LedSlaveDriver_Init, .updater = LedSlaveDriver_Update, .perDriverId = 1 },
@@ -24,7 +24,7 @@ static void bridgeProtocolCallback(I2C_Type *base, i2c_master_handle_t *handle,
if (TestStates.disableI2c) { if (TestStates.disableI2c) {
return; return;
} }
uhk_slave_t *slave = slaves + currentSlaveId; uhk_slave_t *slave = Slaves + currentSlaveId;
slave->isConnected = status == kStatus_Success; slave->isConnected = status == kStatus_Success;
if (!slave->isConnected) { if (!slave->isConnected) {
@@ -34,7 +34,7 @@ static void bridgeProtocolCallback(I2C_Type *base, i2c_master_handle_t *handle,
slave->updater(slave->perDriverId); slave->updater(slave->perDriverId);
currentSlaveId++; currentSlaveId++;
if (currentSlaveId >= (sizeof(slaves) / sizeof(uhk_slave_t))) { if (currentSlaveId >= (sizeof(Slaves) / sizeof(uhk_slave_t))) {
currentSlaveId = 0; currentSlaveId = 0;
} }
} while (!IsI2cTransferScheduled); } while (!IsI2cTransferScheduled);
@@ -42,8 +42,8 @@ static void bridgeProtocolCallback(I2C_Type *base, i2c_master_handle_t *handle,
static void initSlaveDrivers() static void initSlaveDrivers()
{ {
for (uint8_t i=0; i<sizeof(slaves) / sizeof(uhk_slave_t); i++) { for (uint8_t i=0; i<sizeof(Slaves) / sizeof(uhk_slave_t); i++) {
slaves[i].initializer(slaves[i].perDriverId); Slaves[i].initializer(Slaves[i].perDriverId);
} }
} }
@@ -53,5 +53,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].updater(slaves[0].perDriverId); Slaves[0].updater(Slaves[0].perDriverId);
} }
right/src/slave_scheduler.h
+1 -1
View File
@@ -31,7 +31,7 @@
// Variables: // Variables:
extern uhk_slave_t slaves[]; extern uhk_slave_t Slaves[];
// Functions: // Functions: