diff -r 3425c621ee46 -r e93efb4af231 master/ioctl.h --- a/master/ioctl.h Tue Nov 20 14:33:16 2012 +0100 +++ b/master/ioctl.h Tue Nov 20 14:35:53 2012 +0100 @@ -56,7 +56,7 @@ * * Increment this when changing the ioctl interface! */ -#define EC_IOCTL_VERSION_MAGIC 22 +#define EC_IOCTL_VERSION_MAGIC 23 // Command-line tool #define EC_IOCTL_MODULE EC_IOR(0x00, ec_ioctl_module_t) @@ -96,58 +96,60 @@ #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_ACTIVATE EC_IOR(0x21, ec_ioctl_master_activate_t) -#define EC_IOCTL_DEACTIVATE EC_IO(0x22) -#define EC_IOCTL_SEND EC_IO(0x23) -#define EC_IOCTL_RECEIVE EC_IO(0x24) -#define EC_IOCTL_MASTER_STATE EC_IOR(0x25, ec_master_state_t) -#define EC_IOCTL_MASTER_LINK_STATE EC_IOWR(0x26, ec_ioctl_link_state_t) -#define EC_IOCTL_APP_TIME EC_IOW(0x27, ec_ioctl_app_time_t) -#define EC_IOCTL_SYNC_REF EC_IO(0x28) -#define EC_IOCTL_SYNC_SLAVES EC_IO(0x29) -#define EC_IOCTL_SYNC_MON_QUEUE EC_IO(0x2a) -#define EC_IOCTL_SYNC_MON_PROCESS EC_IOR(0x2b, uint32_t) -#define EC_IOCTL_RESET EC_IO(0x2c) -#define EC_IOCTL_SC_SYNC EC_IOW(0x2d, ec_ioctl_config_t) -#define EC_IOCTL_SC_WATCHDOG EC_IOW(0x2e, ec_ioctl_config_t) -#define EC_IOCTL_SC_ADD_PDO EC_IOW(0x2f, ec_ioctl_config_pdo_t) -#define EC_IOCTL_SC_CLEAR_PDOS EC_IOW(0x30, ec_ioctl_config_pdo_t) -#define EC_IOCTL_SC_ADD_ENTRY EC_IOW(0x31, ec_ioctl_add_pdo_entry_t) -#define EC_IOCTL_SC_CLEAR_ENTRIES EC_IOW(0x32, ec_ioctl_config_pdo_t) -#define EC_IOCTL_SC_REG_PDO_ENTRY EC_IOWR(0x33, ec_ioctl_reg_pdo_entry_t) -#define EC_IOCTL_SC_DC EC_IOW(0x34, ec_ioctl_config_t) -#define EC_IOCTL_SC_SDO EC_IOW(0x35, ec_ioctl_sc_sdo_t) -#define EC_IOCTL_SC_EMERG_SIZE EC_IOW(0x36, ec_ioctl_sc_emerg_t) -#define EC_IOCTL_SC_EMERG_POP EC_IOWR(0x37, ec_ioctl_sc_emerg_t) -#define EC_IOCTL_SC_EMERG_CLEAR EC_IOW(0x38, ec_ioctl_sc_emerg_t) -#define EC_IOCTL_SC_EMERG_OVERRUNS EC_IOWR(0x39, ec_ioctl_sc_emerg_t) -#define EC_IOCTL_SC_SDO_REQUEST EC_IOWR(0x3a, ec_ioctl_sdo_request_t) -#define EC_IOCTL_SC_REG_REQUEST EC_IOWR(0x3b, ec_ioctl_reg_request_t) -#define EC_IOCTL_SC_VOE EC_IOWR(0x3c, ec_ioctl_voe_t) -#define EC_IOCTL_SC_STATE EC_IOWR(0x3d, ec_ioctl_sc_state_t) -#define EC_IOCTL_SC_IDN EC_IOW(0x3e, ec_ioctl_sc_idn_t) -#define EC_IOCTL_DOMAIN_OFFSET EC_IO(0x3f) -#define EC_IOCTL_DOMAIN_PROCESS EC_IO(0x40) -#define EC_IOCTL_DOMAIN_QUEUE EC_IO(0x41) -#define EC_IOCTL_DOMAIN_STATE EC_IOWR(0x42, ec_ioctl_domain_state_t) -#define EC_IOCTL_SDO_REQUEST_INDEX EC_IOWR(0x43, ec_ioctl_sdo_request_t) -#define EC_IOCTL_SDO_REQUEST_TIMEOUT EC_IOWR(0x44, ec_ioctl_sdo_request_t) -#define EC_IOCTL_SDO_REQUEST_STATE EC_IOWR(0x45, ec_ioctl_sdo_request_t) -#define EC_IOCTL_SDO_REQUEST_READ EC_IOWR(0x46, ec_ioctl_sdo_request_t) -#define EC_IOCTL_SDO_REQUEST_WRITE EC_IOWR(0x47, ec_ioctl_sdo_request_t) -#define EC_IOCTL_SDO_REQUEST_DATA EC_IOWR(0x48, ec_ioctl_sdo_request_t) -#define EC_IOCTL_REG_REQUEST_DATA EC_IOWR(0x49, ec_ioctl_reg_request_t) -#define EC_IOCTL_REG_REQUEST_STATE EC_IOWR(0x4a, ec_ioctl_reg_request_t) -#define EC_IOCTL_REG_REQUEST_WRITE EC_IOWR(0x4b, ec_ioctl_reg_request_t) -#define EC_IOCTL_REG_REQUEST_READ EC_IOWR(0x4c, ec_ioctl_reg_request_t) -#define EC_IOCTL_VOE_SEND_HEADER EC_IOW(0x4d, ec_ioctl_voe_t) -#define EC_IOCTL_VOE_REC_HEADER EC_IOWR(0x4e, ec_ioctl_voe_t) -#define EC_IOCTL_VOE_READ EC_IOW(0x4f, ec_ioctl_voe_t) -#define EC_IOCTL_VOE_READ_NOSYNC EC_IOW(0x50, ec_ioctl_voe_t) -#define EC_IOCTL_VOE_WRITE EC_IOWR(0x51, ec_ioctl_voe_t) -#define EC_IOCTL_VOE_EXEC EC_IOWR(0x52, ec_ioctl_voe_t) -#define EC_IOCTL_VOE_DATA EC_IOWR(0x53, ec_ioctl_voe_t) -#define EC_IOCTL_SET_SEND_INTERVAL EC_IOW(0x54, size_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_DC EC_IOW(0x36, ec_ioctl_config_t) +#define EC_IOCTL_SC_SDO EC_IOW(0x37, ec_ioctl_sc_sdo_t) +#define EC_IOCTL_SC_EMERG_SIZE EC_IOW(0x38, ec_ioctl_sc_emerg_t) +#define EC_IOCTL_SC_EMERG_POP EC_IOWR(0x39, ec_ioctl_sc_emerg_t) +#define EC_IOCTL_SC_EMERG_CLEAR EC_IOW(0x3a, ec_ioctl_sc_emerg_t) +#define EC_IOCTL_SC_EMERG_OVERRUNS EC_IOWR(0x3b, ec_ioctl_sc_emerg_t) +#define EC_IOCTL_SC_SDO_REQUEST EC_IOWR(0x3c, ec_ioctl_sdo_request_t) +#define EC_IOCTL_SC_REG_REQUEST EC_IOWR(0x3d, ec_ioctl_reg_request_t) +#define EC_IOCTL_SC_VOE EC_IOWR(0x3e, ec_ioctl_voe_t) +#define EC_IOCTL_SC_STATE EC_IOWR(0x3f, ec_ioctl_sc_state_t) +#define EC_IOCTL_SC_IDN EC_IOW(0x40, ec_ioctl_sc_idn_t) +#define EC_IOCTL_DOMAIN_OFFSET EC_IO(0x41) +#define EC_IOCTL_DOMAIN_PROCESS EC_IO(0x42) +#define EC_IOCTL_DOMAIN_QUEUE EC_IO(0x43) +#define EC_IOCTL_DOMAIN_STATE EC_IOWR(0x44, ec_ioctl_domain_state_t) +#define EC_IOCTL_SDO_REQUEST_INDEX EC_IOWR(0x45, ec_ioctl_sdo_request_t) +#define EC_IOCTL_SDO_REQUEST_TIMEOUT EC_IOWR(0x46, ec_ioctl_sdo_request_t) +#define EC_IOCTL_SDO_REQUEST_STATE EC_IOWR(0x47, ec_ioctl_sdo_request_t) +#define EC_IOCTL_SDO_REQUEST_READ EC_IOWR(0x48, ec_ioctl_sdo_request_t) +#define EC_IOCTL_SDO_REQUEST_WRITE EC_IOWR(0x49, ec_ioctl_sdo_request_t) +#define EC_IOCTL_SDO_REQUEST_DATA EC_IOWR(0x4a, ec_ioctl_sdo_request_t) +#define EC_IOCTL_REG_REQUEST_DATA EC_IOWR(0x4b, ec_ioctl_reg_request_t) +#define EC_IOCTL_REG_REQUEST_STATE EC_IOWR(0x4c, ec_ioctl_reg_request_t) +#define EC_IOCTL_REG_REQUEST_WRITE EC_IOWR(0x4d, ec_ioctl_reg_request_t) +#define EC_IOCTL_REG_REQUEST_READ EC_IOWR(0x4e, ec_ioctl_reg_request_t) +#define EC_IOCTL_VOE_SEND_HEADER EC_IOW(0x4f, ec_ioctl_voe_t) +#define EC_IOCTL_VOE_REC_HEADER EC_IOWR(0x50, ec_ioctl_voe_t) +#define EC_IOCTL_VOE_READ EC_IOW(0x51, ec_ioctl_voe_t) +#define EC_IOCTL_VOE_READ_NOSYNC EC_IOW(0x52, ec_ioctl_voe_t) +#define EC_IOCTL_VOE_WRITE EC_IOWR(0x53, ec_ioctl_voe_t) +#define EC_IOCTL_VOE_EXEC EC_IOWR(0x54, ec_ioctl_voe_t) +#define EC_IOCTL_VOE_DATA EC_IOWR(0x55, ec_ioctl_voe_t) +#define EC_IOCTL_SET_SEND_INTERVAL EC_IOW(0x56, size_t) /*****************************************************************************/ @@ -748,12 +750,12 @@ } ec_ioctl_context_t; long ec_ioctl(ec_master_t *, ec_ioctl_context_t *, unsigned int, - void __user *); + void __user *); #ifdef EC_RTDM long ec_ioctl_rtdm(ec_master_t *, ec_ioctl_context_t *, unsigned int, - void __user *); + void __user *); int ec_rtdm_mmap(ec_ioctl_context_t *, void **); #endif