diff -r 07fd94c5119d -r 72e7507b3f1b master/canopen.h --- a/master/canopen.h Thu Sep 13 11:08:46 2007 +0000 +++ b/master/canopen.h Wed Oct 03 08:58:01 2007 +0000 @@ -53,7 +53,7 @@ CANopen SDO. */ -typedef struct +struct ec_sdo { struct kobject kobj; /**< kobject */ struct list_head list; /**< list item */ @@ -63,8 +63,7 @@ char *name; /**< SDO name */ uint8_t subindices; /**< subindices */ struct list_head entries; /**< entry list */ -} -ec_sdo_t; +}; /*****************************************************************************/ @@ -109,11 +108,10 @@ typedef struct { struct list_head list; /**< list item */ - ec_sdo_t *sdo; - ec_sdo_entry_t *entry; + ec_sdo_entry_t *entry; /**< SDO entry */ uint8_t *data; /**< pointer to SDO data */ size_t size; /**< size of SDO data */ - ec_request_state_t state; + ec_request_state_t state; /**< SDO request state */ } ec_sdo_request_t; @@ -121,10 +119,14 @@ int ec_sdo_init(ec_sdo_t *, uint16_t, ec_slave_t *); void ec_sdo_destroy(ec_sdo_t *); +ec_sdo_entry_t *ec_sdo_get_entry(ec_sdo_t *, uint8_t); int ec_sdo_entry_init(ec_sdo_entry_t *, uint8_t, ec_sdo_t *); void ec_sdo_entry_destroy(ec_sdo_entry_t *); +void ec_sdo_request_init_read(ec_sdo_request_t *, ec_sdo_entry_t *); +void ec_sdo_request_clear(ec_sdo_request_t *); + /*****************************************************************************/ #endif