diff --git a/examples/user/main.c b/examples/user/main.c index 7feffc74..8c7083a3 100644 --- a/examples/user/main.c +++ b/examples/user/main.c @@ -100,7 +100,7 @@ static unsigned int blink = 0; // Analog in -------------------------- -static ec_pdo_entry_info_t el3102_pdo_entries[] = { +static const ec_pdo_entry_info_t el3102_pdo_entries[] = { {0x3101, 1, 8}, // channel 1 status {0x3101, 2, 16}, // channel 1 value {0x3102, 1, 8}, // channel 2 status @@ -109,12 +109,12 @@ static ec_pdo_entry_info_t el3102_pdo_entries[] = { {0x6401, 2, 16} // channel 2 value (alt.) }; -static ec_pdo_info_t el3102_pdos[] = { +static const ec_pdo_info_t el3102_pdos[] = { {0x1A00, 2, el3102_pdo_entries}, {0x1A01, 2, el3102_pdo_entries + 2} }; -static ec_sync_info_t el3102_syncs[] = { +static const ec_sync_info_t el3102_syncs[] = { {2, EC_DIR_OUTPUT}, {3, EC_DIR_INPUT, 2, el3102_pdos}, {0xff} @@ -122,17 +122,17 @@ static ec_sync_info_t el3102_syncs[] = { // Analog out ------------------------- -static ec_pdo_entry_info_t el4102_pdo_entries[] = { +static const ec_pdo_entry_info_t el4102_pdo_entries[] = { {0x3001, 1, 16}, // channel 1 value {0x3002, 1, 16}, // channel 2 value }; -static ec_pdo_info_t el4102_pdos[] = { +static const ec_pdo_info_t el4102_pdos[] = { {0x1600, 1, el4102_pdo_entries}, {0x1601, 1, el4102_pdo_entries + 1} }; -static ec_sync_info_t el4102_syncs[] = { +static const ec_sync_info_t el4102_syncs[] = { {2, EC_DIR_OUTPUT, 2, el4102_pdos}, {3, EC_DIR_INPUT}, {0xff} @@ -140,21 +140,21 @@ static ec_sync_info_t el4102_syncs[] = { // Digital out ------------------------ -static ec_pdo_entry_info_t el2004_channels[] = { +static const ec_pdo_entry_info_t el2004_channels[] = { {0x3001, 1, 1}, // Value 1 {0x3001, 2, 1}, // Value 2 {0x3001, 3, 1}, // Value 3 {0x3001, 4, 1} // Value 4 }; -static ec_pdo_info_t el2004_pdos[] = { +static const ec_pdo_info_t el2004_pdos[] = { {0x1600, 1, &el2004_channels[0]}, {0x1601, 1, &el2004_channels[1]}, {0x1602, 1, &el2004_channels[2]}, {0x1603, 1, &el2004_channels[3]} }; -static ec_sync_info_t el2004_syncs[] = { +static const ec_sync_info_t el2004_syncs[] = { {0, EC_DIR_OUTPUT, 4, el2004_pdos}, {1, EC_DIR_INPUT}, {0xff} diff --git a/examples/xenomai/main.c b/examples/xenomai/main.c index e76dff20..ca3d8674 100644 --- a/examples/xenomai/main.c +++ b/examples/xenomai/main.c @@ -84,14 +84,14 @@ const static ec_pdo_entry_reg_t domain1_regs[] = { * Revision number: 0x00100000 */ -ec_pdo_entry_info_t slave_1_pdo_entries[] = { +const ec_pdo_entry_info_t slave_1_pdo_entries[] = { {0x7000, 0x01, 1}, /* Output */ {0x7010, 0x01, 1}, /* Output */ {0x7020, 0x01, 1}, /* Output */ {0x7030, 0x01, 1}, /* Output */ }; -ec_pdo_info_t slave_1_pdos[] = { +const ec_pdo_info_t slave_1_pdos[] = { {0x1600, 1, slave_1_pdo_entries + 0}, /* Channel 1 */ {0x1601, 1, slave_1_pdo_entries + 1}, /* Channel 2 */ {0x1602, 1, slave_1_pdo_entries + 2}, /* Channel 3 */ diff --git a/examples/xenomai_posix/main.c b/examples/xenomai_posix/main.c index 28f9254f..71593b75 100644 --- a/examples/xenomai_posix/main.c +++ b/examples/xenomai_posix/main.c @@ -86,21 +86,21 @@ const static ec_pdo_entry_reg_t domain1_regs[] = { * Revision number: 0x00100000 */ -ec_pdo_entry_info_t slave_1_pdo_entries[] = { +const ec_pdo_entry_info_t slave_1_pdo_entries[] = { {0x7000, 0x01, 1}, /* Output */ {0x7010, 0x01, 1}, /* Output */ {0x7020, 0x01, 1}, /* Output */ {0x7030, 0x01, 1}, /* Output */ }; -ec_pdo_info_t slave_1_pdos[] = { +const ec_pdo_info_t slave_1_pdos[] = { {0x1600, 1, slave_1_pdo_entries + 0}, /* Channel 1 */ {0x1601, 1, slave_1_pdo_entries + 1}, /* Channel 2 */ {0x1602, 1, slave_1_pdo_entries + 2}, /* Channel 3 */ {0x1603, 1, slave_1_pdo_entries + 3}, /* Channel 4 */ }; -ec_sync_info_t slave_1_syncs[] = { +const ec_sync_info_t slave_1_syncs[] = { {0, EC_DIR_OUTPUT, 4, slave_1_pdos + 0, EC_WD_ENABLE}, {0xff} }; diff --git a/include/ecrt.h b/include/ecrt.h index 554f74d1..ab3f8035 100644 --- a/include/ecrt.h +++ b/include/ecrt.h @@ -547,7 +547,7 @@ typedef struct { Zero means, that the default mapping shall be used (this can only be done if the slave is present at bus configuration time). */ - ec_pdo_entry_info_t *entries; /**< Array of PDO entries to map. Can either + ec_pdo_entry_info_t const *entries; /**< Array of PDO entries to map. Can either be \a NULL, or must contain at least \a n_entries values. */ } ec_pdo_info_t; @@ -566,7 +566,7 @@ typedef struct { but can also be \a 0xff to mark the end of the list. */ ec_direction_t dir; /**< Sync manager direction. */ unsigned int n_pdos; /**< Number of PDOs in \a pdos. */ - ec_pdo_info_t *pdos; /**< Array with PDOs to assign. This must contain + ec_pdo_info_t const *pdos; /**< Array with PDOs to assign. This must contain at least \a n_pdos PDOs. */ ec_watchdog_mode_t watchdog_mode; /**< Watchdog mode. */ } ec_sync_info_t;