diff -r 8f7bbbd3b7ac -r 44c2b7c0ae1a master/ioctl.h --- a/master/ioctl.h Thu Apr 23 12:25:09 2009 +0000 +++ b/master/ioctl.h Thu Apr 23 14:45:07 2009 +0000 @@ -86,32 +86,37 @@ #define EC_IOCTL_SEND EC_IO(0x1c) #define EC_IOCTL_RECEIVE EC_IO(0x1d) #define EC_IOCTL_MASTER_STATE EC_IOR(0x1e, ec_master_state_t) -#define EC_IOCTL_SC_SYNC EC_IOW(0x1f, ec_ioctl_config_t) -#define EC_IOCTL_SC_ADD_PDO EC_IOW(0x20, ec_ioctl_config_pdo_t) -#define EC_IOCTL_SC_CLEAR_PDOS EC_IOW(0x21, ec_ioctl_config_pdo_t) -#define EC_IOCTL_SC_ADD_ENTRY EC_IOW(0x22, ec_ioctl_add_pdo_entry_t) -#define EC_IOCTL_SC_CLEAR_ENTRIES EC_IOW(0x23, ec_ioctl_config_pdo_t) -#define EC_IOCTL_SC_REG_PDO_ENTRY EC_IOWR(0x24, ec_ioctl_reg_pdo_entry_t) -#define EC_IOCTL_SC_SDO EC_IOW(0x25, ec_ioctl_sc_sdo_t) -#define EC_IOCTL_SC_SDO_REQUEST EC_IOWR(0x26, ec_ioctl_sdo_request_t) -#define EC_IOCTL_SC_VOE EC_IOWR(0x27, ec_ioctl_voe_t) -#define EC_IOCTL_SC_STATE EC_IOWR(0x28, ec_ioctl_sc_state_t) -#define EC_IOCTL_DOMAIN_OFFSET EC_IO(0x29) -#define EC_IOCTL_DOMAIN_PROCESS EC_IO(0x2a) -#define EC_IOCTL_DOMAIN_QUEUE EC_IO(0x2b) -#define EC_IOCTL_DOMAIN_STATE EC_IOWR(0x2c, ec_ioctl_domain_state_t) -#define EC_IOCTL_SDO_REQUEST_TIMEOUT EC_IOWR(0x2d, ec_ioctl_sdo_request_t) -#define EC_IOCTL_SDO_REQUEST_STATE EC_IOWR(0x2e, ec_ioctl_sdo_request_t) -#define EC_IOCTL_SDO_REQUEST_READ EC_IOWR(0x2f, ec_ioctl_sdo_request_t) -#define EC_IOCTL_SDO_REQUEST_WRITE EC_IOWR(0x30, ec_ioctl_sdo_request_t) -#define EC_IOCTL_SDO_REQUEST_DATA EC_IOWR(0x31, ec_ioctl_sdo_request_t) -#define EC_IOCTL_VOE_SEND_HEADER EC_IOW(0x32, ec_ioctl_voe_t) -#define EC_IOCTL_VOE_REC_HEADER EC_IOWR(0x33, ec_ioctl_voe_t) -#define EC_IOCTL_VOE_READ EC_IOW(0x34, ec_ioctl_voe_t) -#define EC_IOCTL_VOE_READ_NOSYNC EC_IOW(0x35, ec_ioctl_voe_t) -#define EC_IOCTL_VOE_WRITE EC_IOWR(0x36, ec_ioctl_voe_t) -#define EC_IOCTL_VOE_EXEC EC_IOWR(0x37, ec_ioctl_voe_t) -#define EC_IOCTL_VOE_DATA EC_IOWR(0x38, ec_ioctl_voe_t) +#define EC_IOCTL_SYNC_REF EC_IOW(0x1f, ec_ioctl_dc_t) +#define EC_IOCTL_SYNC_SLAVES EC_IOW(0x20, ec_ioctl_dc_t) +#define EC_IOCTL_SC_SYNC EC_IOW(0x21, ec_ioctl_config_t) +#define EC_IOCTL_SC_ADD_PDO EC_IOW(0x22, ec_ioctl_config_pdo_t) +#define EC_IOCTL_SC_CLEAR_PDOS EC_IOW(0x23, ec_ioctl_config_pdo_t) +#define EC_IOCTL_SC_ADD_ENTRY EC_IOW(0x24, ec_ioctl_add_pdo_entry_t) +#define EC_IOCTL_SC_CLEAR_ENTRIES EC_IOW(0x25, ec_ioctl_config_pdo_t) +#define EC_IOCTL_SC_REG_PDO_ENTRY EC_IOWR(0x26, ec_ioctl_reg_pdo_entry_t) +#define EC_IOCTL_SC_DC_ASSIGN EC_IOW(0x27, ec_ioctl_sc_dc_t) +#define EC_IOCTL_SC_DC_CYCLE EC_IOW(0x28, ec_ioctl_sc_dc_t) +#define EC_IOCTL_SC_DC_SHIFT EC_IOW(0x29, ec_ioctl_sc_dc_t) +#define EC_IOCTL_SC_SDO EC_IOW(0x2a, ec_ioctl_sc_sdo_t) +#define EC_IOCTL_SC_SDO_REQUEST EC_IOWR(0x2b, ec_ioctl_sdo_request_t) +#define EC_IOCTL_SC_VOE EC_IOWR(0x2c, ec_ioctl_voe_t) +#define EC_IOCTL_SC_STATE EC_IOWR(0x2d, ec_ioctl_sc_state_t) +#define EC_IOCTL_DOMAIN_OFFSET EC_IO(0x2e) +#define EC_IOCTL_DOMAIN_PROCESS EC_IO(0x2f) +#define EC_IOCTL_DOMAIN_QUEUE EC_IO(0x30) +#define EC_IOCTL_DOMAIN_STATE EC_IOWR(0x31, ec_ioctl_domain_state_t) +#define EC_IOCTL_SDO_REQUEST_TIMEOUT EC_IOWR(0x32, ec_ioctl_sdo_request_t) +#define EC_IOCTL_SDO_REQUEST_STATE EC_IOWR(0x33, ec_ioctl_sdo_request_t) +#define EC_IOCTL_SDO_REQUEST_READ EC_IOWR(0x34, ec_ioctl_sdo_request_t) +#define EC_IOCTL_SDO_REQUEST_WRITE EC_IOWR(0x35, ec_ioctl_sdo_request_t) +#define EC_IOCTL_SDO_REQUEST_DATA EC_IOWR(0x36, ec_ioctl_sdo_request_t) +#define EC_IOCTL_VOE_SEND_HEADER EC_IOW(0x37, ec_ioctl_voe_t) +#define EC_IOCTL_VOE_REC_HEADER EC_IOWR(0x38, ec_ioctl_voe_t) +#define EC_IOCTL_VOE_READ EC_IOW(0x39, ec_ioctl_voe_t) +#define EC_IOCTL_VOE_READ_NOSYNC EC_IOW(0x3a, ec_ioctl_voe_t) +#define EC_IOCTL_VOE_WRITE EC_IOWR(0x3b, ec_ioctl_voe_t) +#define EC_IOCTL_VOE_EXEC EC_IOWR(0x3c, ec_ioctl_voe_t) +#define EC_IOCTL_VOE_DATA EC_IOWR(0x3d, ec_ioctl_voe_t) /*****************************************************************************/ @@ -382,6 +387,13 @@ typedef struct { // inputs + struct timeval app_time; +} ec_ioctl_dc_t; + +/*****************************************************************************/ + +typedef struct { + // inputs uint32_t config_index; uint8_t sync_index; uint16_t pdo_pos; @@ -451,6 +463,16 @@ typedef struct { // inputs uint32_t config_index; + uint16_t assign_activate; + uint32_t cycle[2]; + uint32_t shift[2]; +} ec_ioctl_sc_dc_t; + +/*****************************************************************************/ + +typedef struct { + // inputs + uint32_t config_index; uint16_t index; uint8_t subindex; const uint8_t *data;