master/slave.c
changeset 1337 0253c74d0940
parent 1327 4d179b06dd3c
child 1338 eb31b5a135da
equal deleted inserted replaced
1336:e27b37e80a99 1337:0253c74d0940
    88     }
    88     }
    89 
    89 
    90     slave->sii_words = NULL;
    90     slave->sii_words = NULL;
    91     slave->sii_nwords = 0;
    91     slave->sii_nwords = 0;
    92 
    92 
    93     slave->sii.alias = 0;
    93     slave->sii.alias = 0x0000;
    94     slave->sii.vendor_id = 0;
    94     slave->sii.vendor_id = 0x00000000;
    95     slave->sii.product_code = 0;
    95     slave->sii.product_code = 0x00000000;
    96     slave->sii.revision_number = 0;
    96     slave->sii.revision_number = 0x00000000;
    97     slave->sii.serial_number = 0;
    97     slave->sii.serial_number = 0x00000000;
    98     slave->sii.rx_mailbox_offset = 0;
    98     slave->sii.boot_rx_mailbox_offset = 0x0000;
    99     slave->sii.rx_mailbox_size = 0;
    99     slave->sii.boot_rx_mailbox_size = 0x0000;
   100     slave->sii.tx_mailbox_offset = 0;
   100     slave->sii.boot_tx_mailbox_offset = 0x0000;
   101     slave->sii.tx_mailbox_size = 0;
   101     slave->sii.boot_tx_mailbox_size = 0x0000;
       
   102     slave->sii.std_rx_mailbox_offset = 0x0000;
       
   103     slave->sii.std_rx_mailbox_size = 0x0000;
       
   104     slave->sii.std_tx_mailbox_offset = 0x0000;
       
   105     slave->sii.std_tx_mailbox_size = 0x0000;
   102     slave->sii.mailbox_protocols = 0;
   106     slave->sii.mailbox_protocols = 0;
   103 
   107 
   104     slave->sii.strings = NULL;
   108     slave->sii.strings = NULL;
   105     slave->sii.string_count = 0;
   109     slave->sii.string_count = 0;
   106 
   110 
   197 {
   201 {
   198     if (new_state != slave->current_state) {
   202     if (new_state != slave->current_state) {
   199         if (slave->master->debug_level) {
   203         if (slave->master->debug_level) {
   200             char old_state[EC_STATE_STRING_SIZE],
   204             char old_state[EC_STATE_STRING_SIZE],
   201                 cur_state[EC_STATE_STRING_SIZE];
   205                 cur_state[EC_STATE_STRING_SIZE];
   202             ec_state_string(slave->current_state, old_state);
   206             ec_state_string(slave->current_state, old_state, 0);
   203             ec_state_string(new_state, cur_state);
   207             ec_state_string(new_state, cur_state, 0);
   204             EC_DBG("Slave %u: %s -> %s.\n",
   208             EC_DBG("Slave %u: %s -> %s.\n",
   205                    slave->ring_position, old_state, cur_state);
   209                    slave->ring_position, old_state, cur_state);
   206         }
   210         }
   207         slave->current_state = new_state;
   211         slave->current_state = new_state;
   208     }
   212     }