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

Rename uhk_slave_t.moduleId to uhk_slave_t.perDriverId

Browse Source
This commit is contained in:
László Monda
2017-05-05 02:32:45 +02:00
parent 588596662a
commit 387652faaa
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
right/src/slave_scheduler.c
+5 -5
View File
@@ -16,9 +16,9 @@ slave_driver_initializer_t slaveDriverInitializers[] = {
}; };
uhk_slave_t slaves[] = { uhk_slave_t slaves[] = {
{ .updater = UhkModuleSlaveDriver_Update, .moduleId = 0 }, { .updater = UhkModuleSlaveDriver_Update, .perDriverId = 0 },
{ .updater = LedSlaveDriver_Update, .moduleId = 0 }, { .updater = LedSlaveDriver_Update, .perDriverId = 0 },
{ .updater = LedSlaveDriver_Update, .moduleId = 1 }, { .updater = LedSlaveDriver_Update, .perDriverId = 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 + currentSlaveId; uhk_slave_t *bridgeSlave = slaves + currentSlaveId;
bridgeSlave->updater(bridgeSlave->moduleId); bridgeSlave->updater(bridgeSlave->perDriverId);
currentSlaveId++; currentSlaveId++;
if (currentSlaveId >= (sizeof(slaves) / sizeof(uhk_slave_t))) { if (currentSlaveId >= (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].updater(slaves[0].moduleId); slaves[0].updater(slaves[0].perDriverId);
} }
right/src/slave_scheduler.h
+1 -1
View File
@@ -17,7 +17,7 @@
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 perDriverId; // Identifies the slave instance on a per-driver basis
slave_updater_t *updater; slave_updater_t *updater;
bool isConnected; bool isConnected;
} uhk_slave_t; } uhk_slave_t;