diff -r d71acfbd7319 -r 0e145bb05859 master/ioctl.h --- a/master/ioctl.h Thu Nov 06 08:55:35 2014 +0100 +++ b/master/ioctl.h Wed Nov 12 14:42:17 2014 +0100 @@ -56,7 +56,7 @@ * * Increment this when changing the ioctl interface! */ -#define EC_IOCTL_VERSION_MAGIC 28 +#define EC_IOCTL_VERSION_MAGIC 29 // Command-line tool #define EC_IOCTL_MODULE EC_IOR(0x00, ec_ioctl_module_t) @@ -83,75 +83,76 @@ #define EC_IOCTL_SLAVE_FOE_WRITE EC_IOW(0x15, ec_ioctl_slave_foe_t) #define EC_IOCTL_SLAVE_SOE_READ EC_IOWR(0x16, ec_ioctl_slave_soe_read_t) #define EC_IOCTL_SLAVE_SOE_WRITE EC_IOWR(0x17, ec_ioctl_slave_soe_write_t) -#define EC_IOCTL_CONFIG EC_IOWR(0x18, ec_ioctl_config_t) -#define EC_IOCTL_CONFIG_PDO EC_IOWR(0x19, ec_ioctl_config_pdo_t) -#define EC_IOCTL_CONFIG_PDO_ENTRY EC_IOWR(0x1a, ec_ioctl_config_pdo_entry_t) -#define EC_IOCTL_CONFIG_SDO EC_IOWR(0x1b, ec_ioctl_config_sdo_t) -#define EC_IOCTL_CONFIG_IDN EC_IOWR(0x1c, ec_ioctl_config_idn_t) +#define EC_IOCTL_SLAVE_EOE_IP_PARAM EC_IOW(0x18, ec_ioctl_slave_eoe_ip_t) +#define EC_IOCTL_CONFIG EC_IOWR(0x19, ec_ioctl_config_t) +#define EC_IOCTL_CONFIG_PDO EC_IOWR(0x1a, ec_ioctl_config_pdo_t) +#define EC_IOCTL_CONFIG_PDO_ENTRY EC_IOWR(0x1b, ec_ioctl_config_pdo_entry_t) +#define EC_IOCTL_CONFIG_SDO EC_IOWR(0x1c, ec_ioctl_config_sdo_t) +#define EC_IOCTL_CONFIG_IDN EC_IOWR(0x1d, ec_ioctl_config_idn_t) #ifdef EC_EOE -#define EC_IOCTL_EOE_HANDLER EC_IOWR(0x1d, ec_ioctl_eoe_handler_t) +#define EC_IOCTL_EOE_HANDLER EC_IOWR(0x1e, ec_ioctl_eoe_handler_t) #endif // Application interface -#define EC_IOCTL_REQUEST EC_IO(0x1e) -#define EC_IOCTL_CREATE_DOMAIN EC_IO(0x1f) -#define EC_IOCTL_CREATE_SLAVE_CONFIG EC_IOWR(0x20, ec_ioctl_config_t) -#define EC_IOCTL_SELECT_REF_CLOCK EC_IOW(0x21, uint32_t) -#define EC_IOCTL_ACTIVATE EC_IOR(0x22, ec_ioctl_master_activate_t) -#define EC_IOCTL_DEACTIVATE EC_IO(0x23) -#define EC_IOCTL_SEND EC_IO(0x24) -#define EC_IOCTL_RECEIVE EC_IO(0x25) -#define EC_IOCTL_MASTER_STATE EC_IOR(0x26, ec_master_state_t) -#define EC_IOCTL_MASTER_LINK_STATE EC_IOWR(0x27, ec_ioctl_link_state_t) -#define EC_IOCTL_APP_TIME EC_IOW(0x28, ec_ioctl_app_time_t) -#define EC_IOCTL_SYNC_REF EC_IO(0x29) -#define EC_IOCTL_SYNC_SLAVES EC_IO(0x2a) -#define EC_IOCTL_REF_CLOCK_TIME EC_IOR(0x2b, uint32_t) -#define EC_IOCTL_SYNC_MON_QUEUE EC_IO(0x2c) -#define EC_IOCTL_SYNC_MON_PROCESS EC_IOR(0x2d, uint32_t) -#define EC_IOCTL_RESET EC_IO(0x2e) -#define EC_IOCTL_SC_SYNC EC_IOW(0x2f, ec_ioctl_config_t) -#define EC_IOCTL_SC_WATCHDOG EC_IOW(0x30, ec_ioctl_config_t) -#define EC_IOCTL_SC_ADD_PDO EC_IOW(0x31, ec_ioctl_config_pdo_t) -#define EC_IOCTL_SC_CLEAR_PDOS EC_IOW(0x32, ec_ioctl_config_pdo_t) -#define EC_IOCTL_SC_ADD_ENTRY EC_IOW(0x33, ec_ioctl_add_pdo_entry_t) -#define EC_IOCTL_SC_CLEAR_ENTRIES EC_IOW(0x34, ec_ioctl_config_pdo_t) -#define EC_IOCTL_SC_REG_PDO_ENTRY EC_IOWR(0x35, ec_ioctl_reg_pdo_entry_t) -#define EC_IOCTL_SC_REG_PDO_POS EC_IOWR(0x36, ec_ioctl_reg_pdo_pos_t) -#define EC_IOCTL_SC_DC EC_IOW(0x37, ec_ioctl_config_t) -#define EC_IOCTL_SC_SDO EC_IOW(0x38, ec_ioctl_sc_sdo_t) -#define EC_IOCTL_SC_EMERG_SIZE EC_IOW(0x39, ec_ioctl_sc_emerg_t) -#define EC_IOCTL_SC_EMERG_POP EC_IOWR(0x3a, ec_ioctl_sc_emerg_t) -#define EC_IOCTL_SC_EMERG_CLEAR EC_IOW(0x3b, ec_ioctl_sc_emerg_t) -#define EC_IOCTL_SC_EMERG_OVERRUNS EC_IOWR(0x3c, ec_ioctl_sc_emerg_t) -#define EC_IOCTL_SC_SDO_REQUEST EC_IOWR(0x3d, ec_ioctl_sdo_request_t) -#define EC_IOCTL_SC_REG_REQUEST EC_IOWR(0x3e, ec_ioctl_reg_request_t) -#define EC_IOCTL_SC_VOE EC_IOWR(0x3f, ec_ioctl_voe_t) -#define EC_IOCTL_SC_STATE EC_IOWR(0x40, ec_ioctl_sc_state_t) -#define EC_IOCTL_SC_IDN EC_IOW(0x41, ec_ioctl_sc_idn_t) -#define EC_IOCTL_DOMAIN_SIZE EC_IO(0x42) -#define EC_IOCTL_DOMAIN_OFFSET EC_IO(0x43) -#define EC_IOCTL_DOMAIN_PROCESS EC_IO(0x44) -#define EC_IOCTL_DOMAIN_QUEUE EC_IO(0x45) -#define EC_IOCTL_DOMAIN_STATE EC_IOWR(0x46, ec_ioctl_domain_state_t) -#define EC_IOCTL_SDO_REQUEST_INDEX EC_IOWR(0x47, ec_ioctl_sdo_request_t) -#define EC_IOCTL_SDO_REQUEST_TIMEOUT EC_IOWR(0x48, ec_ioctl_sdo_request_t) -#define EC_IOCTL_SDO_REQUEST_STATE EC_IOWR(0x49, ec_ioctl_sdo_request_t) -#define EC_IOCTL_SDO_REQUEST_READ EC_IOWR(0x4a, ec_ioctl_sdo_request_t) -#define EC_IOCTL_SDO_REQUEST_WRITE EC_IOWR(0x4b, ec_ioctl_sdo_request_t) -#define EC_IOCTL_SDO_REQUEST_DATA EC_IOWR(0x4c, ec_ioctl_sdo_request_t) -#define EC_IOCTL_REG_REQUEST_DATA EC_IOWR(0x4d, ec_ioctl_reg_request_t) -#define EC_IOCTL_REG_REQUEST_STATE EC_IOWR(0x4e, ec_ioctl_reg_request_t) -#define EC_IOCTL_REG_REQUEST_WRITE EC_IOWR(0x4f, ec_ioctl_reg_request_t) -#define EC_IOCTL_REG_REQUEST_READ EC_IOWR(0x50, ec_ioctl_reg_request_t) -#define EC_IOCTL_VOE_SEND_HEADER EC_IOW(0x51, ec_ioctl_voe_t) -#define EC_IOCTL_VOE_REC_HEADER EC_IOWR(0x52, ec_ioctl_voe_t) -#define EC_IOCTL_VOE_READ EC_IOW(0x53, ec_ioctl_voe_t) -#define EC_IOCTL_VOE_READ_NOSYNC EC_IOW(0x54, ec_ioctl_voe_t) -#define EC_IOCTL_VOE_WRITE EC_IOWR(0x55, ec_ioctl_voe_t) -#define EC_IOCTL_VOE_EXEC EC_IOWR(0x56, ec_ioctl_voe_t) -#define EC_IOCTL_VOE_DATA EC_IOWR(0x57, ec_ioctl_voe_t) -#define EC_IOCTL_SET_SEND_INTERVAL EC_IOW(0x58, size_t) +#define EC_IOCTL_REQUEST EC_IO(0x1f) +#define EC_IOCTL_CREATE_DOMAIN EC_IO(0x20) +#define EC_IOCTL_CREATE_SLAVE_CONFIG EC_IOWR(0x21, ec_ioctl_config_t) +#define EC_IOCTL_SELECT_REF_CLOCK EC_IOW(0x22, uint32_t) +#define EC_IOCTL_ACTIVATE EC_IOR(0x23, ec_ioctl_master_activate_t) +#define EC_IOCTL_DEACTIVATE EC_IO(0x24) +#define EC_IOCTL_SEND EC_IO(0x25) +#define EC_IOCTL_RECEIVE EC_IO(0x26) +#define EC_IOCTL_MASTER_STATE EC_IOR(0x27, ec_master_state_t) +#define EC_IOCTL_MASTER_LINK_STATE EC_IOWR(0x28, ec_ioctl_link_state_t) +#define EC_IOCTL_APP_TIME EC_IOW(0x29, ec_ioctl_app_time_t) +#define EC_IOCTL_SYNC_REF EC_IO(0x2a) +#define EC_IOCTL_SYNC_SLAVES EC_IO(0x2b) +#define EC_IOCTL_REF_CLOCK_TIME EC_IOR(0x2c, uint32_t) +#define EC_IOCTL_SYNC_MON_QUEUE EC_IO(0x2d) +#define EC_IOCTL_SYNC_MON_PROCESS EC_IOR(0x2e, uint32_t) +#define EC_IOCTL_RESET EC_IO(0x2f) +#define EC_IOCTL_SC_SYNC EC_IOW(0x30, ec_ioctl_config_t) +#define EC_IOCTL_SC_WATCHDOG EC_IOW(0x31, ec_ioctl_config_t) +#define EC_IOCTL_SC_ADD_PDO EC_IOW(0x32, ec_ioctl_config_pdo_t) +#define EC_IOCTL_SC_CLEAR_PDOS EC_IOW(0x33, ec_ioctl_config_pdo_t) +#define EC_IOCTL_SC_ADD_ENTRY EC_IOW(0x34, ec_ioctl_add_pdo_entry_t) +#define EC_IOCTL_SC_CLEAR_ENTRIES EC_IOW(0x35, ec_ioctl_config_pdo_t) +#define EC_IOCTL_SC_REG_PDO_ENTRY EC_IOWR(0x36, ec_ioctl_reg_pdo_entry_t) +#define EC_IOCTL_SC_REG_PDO_POS EC_IOWR(0x37, ec_ioctl_reg_pdo_pos_t) +#define EC_IOCTL_SC_DC EC_IOW(0x38, ec_ioctl_config_t) +#define EC_IOCTL_SC_SDO EC_IOW(0x39, ec_ioctl_sc_sdo_t) +#define EC_IOCTL_SC_EMERG_SIZE EC_IOW(0x3a, ec_ioctl_sc_emerg_t) +#define EC_IOCTL_SC_EMERG_POP EC_IOWR(0x3b, ec_ioctl_sc_emerg_t) +#define EC_IOCTL_SC_EMERG_CLEAR EC_IOW(0x3c, ec_ioctl_sc_emerg_t) +#define EC_IOCTL_SC_EMERG_OVERRUNS EC_IOWR(0x3d, ec_ioctl_sc_emerg_t) +#define EC_IOCTL_SC_SDO_REQUEST EC_IOWR(0x3e, ec_ioctl_sdo_request_t) +#define EC_IOCTL_SC_REG_REQUEST EC_IOWR(0x3f, ec_ioctl_reg_request_t) +#define EC_IOCTL_SC_VOE EC_IOWR(0x40, ec_ioctl_voe_t) +#define EC_IOCTL_SC_STATE EC_IOWR(0x41, ec_ioctl_sc_state_t) +#define EC_IOCTL_SC_IDN EC_IOW(0x42, ec_ioctl_sc_idn_t) +#define EC_IOCTL_DOMAIN_SIZE EC_IO(0x43) +#define EC_IOCTL_DOMAIN_OFFSET EC_IO(0x44) +#define EC_IOCTL_DOMAIN_PROCESS EC_IO(0x45) +#define EC_IOCTL_DOMAIN_QUEUE EC_IO(0x46) +#define EC_IOCTL_DOMAIN_STATE EC_IOWR(0x47, ec_ioctl_domain_state_t) +#define EC_IOCTL_SDO_REQUEST_INDEX EC_IOWR(0x48, ec_ioctl_sdo_request_t) +#define EC_IOCTL_SDO_REQUEST_TIMEOUT EC_IOWR(0x49, ec_ioctl_sdo_request_t) +#define EC_IOCTL_SDO_REQUEST_STATE EC_IOWR(0x4a, ec_ioctl_sdo_request_t) +#define EC_IOCTL_SDO_REQUEST_READ EC_IOWR(0x4b, ec_ioctl_sdo_request_t) +#define EC_IOCTL_SDO_REQUEST_WRITE EC_IOWR(0x4c, ec_ioctl_sdo_request_t) +#define EC_IOCTL_SDO_REQUEST_DATA EC_IOWR(0x4d, ec_ioctl_sdo_request_t) +#define EC_IOCTL_REG_REQUEST_DATA EC_IOWR(0x4e, ec_ioctl_reg_request_t) +#define EC_IOCTL_REG_REQUEST_STATE EC_IOWR(0x4f, ec_ioctl_reg_request_t) +#define EC_IOCTL_REG_REQUEST_WRITE EC_IOWR(0x50, ec_ioctl_reg_request_t) +#define EC_IOCTL_REG_REQUEST_READ EC_IOWR(0x51, ec_ioctl_reg_request_t) +#define EC_IOCTL_VOE_SEND_HEADER EC_IOW(0x52, ec_ioctl_voe_t) +#define EC_IOCTL_VOE_REC_HEADER EC_IOWR(0x53, ec_ioctl_voe_t) +#define EC_IOCTL_VOE_READ EC_IOW(0x54, ec_ioctl_voe_t) +#define EC_IOCTL_VOE_READ_NOSYNC EC_IOW(0x55, ec_ioctl_voe_t) +#define EC_IOCTL_VOE_WRITE EC_IOWR(0x56, ec_ioctl_voe_t) +#define EC_IOCTL_VOE_EXEC EC_IOWR(0x57, ec_ioctl_voe_t) +#define EC_IOCTL_VOE_DATA EC_IOWR(0x58, ec_ioctl_voe_t) +#define EC_IOCTL_SET_SEND_INTERVAL EC_IOW(0x59, size_t) /*****************************************************************************/ @@ -590,6 +591,37 @@ /*****************************************************************************/ +#define EC_ETH_ALEN 6 +#ifdef ETH_ALEN +#if ETH_ALEN != EC_ETH_ALEN +#error Ethernet address length mismatch +#endif +#endif + +typedef struct { + // input + uint16_t slave_position; + + uint8_t mac_address_included; + uint8_t ip_address_included; + uint8_t subnet_mask_included; + uint8_t gateway_included; + uint8_t dns_included; + uint8_t name_included; + + unsigned char mac_address[EC_ETH_ALEN]; + uint32_t ip_address; + uint32_t subnet_mask; + uint32_t gateway; + uint32_t dns; + char name[EC_MAX_HOSTNAME_SIZE]; + + // output + uint16_t result; +} ec_ioctl_slave_eoe_ip_t; + +/*****************************************************************************/ + typedef struct { // outputs void *process_data;