From eba73fc292a9e6f2982c6f17f377712deaa0a486 Mon Sep 17 00:00:00 2001 From: Florian Pose Date: Tue, 31 Aug 2021 13:29:16 +0200 Subject: [PATCH] Strictly using KERN_CONT for continued printk() calls to avoid newlines. --- master/datagram.c | 35 +++++++++++++++++++---------------- master/domain.c | 10 +++++----- master/ethernet.c | 21 +++++++++++---------- master/fsm_foe.c | 11 ++++++----- master/fsm_pdo.c | 12 ++++++------ master/fsm_pdo_entry.c | 6 +++--- master/fsm_soe.c | 6 +++--- master/mailbox.c | 7 ++++--- master/module.c | 20 ++++++++++++-------- master/pdo.c | 6 +++--- master/pdo_list.c | 6 +++--- 11 files changed, 75 insertions(+), 65 deletions(-) diff --git a/master/datagram.c b/master/datagram.c index f6163274..1682eb3d 100644 --- a/master/datagram.c +++ b/master/datagram.c @@ -566,31 +566,31 @@ void ec_datagram_print_state( const ec_datagram_t *datagram /**< EtherCAT datagram */ ) { - printk("Datagram "); + printk(KERN_CONT "Datagram "); switch (datagram->state) { case EC_DATAGRAM_INIT: - printk("initialized"); + printk(KERN_CONT "initialized"); break; case EC_DATAGRAM_QUEUED: - printk("queued"); + printk(KERN_CONT "queued"); break; case EC_DATAGRAM_SENT: - printk("sent"); + printk(KERN_CONT "sent"); break; case EC_DATAGRAM_RECEIVED: - printk("received"); + printk(KERN_CONT "received"); break; case EC_DATAGRAM_TIMED_OUT: - printk("timed out"); + printk(KERN_CONT "timed out"); break; case EC_DATAGRAM_ERROR: - printk("error"); + printk(KERN_CONT "error"); break; default: - printk("???"); + printk(KERN_CONT "???"); } - printk(".\n"); + printk(KERN_CONT ".\n"); } /*****************************************************************************/ @@ -603,13 +603,16 @@ void ec_datagram_print_wc_error( const ec_datagram_t *datagram /**< EtherCAT datagram */ ) { - if (datagram->working_counter == 0) - printk("No response."); - else if (datagram->working_counter > 1) - printk("%u slaves responded!", datagram->working_counter); - else - printk("Success."); - printk("\n"); + if (datagram->working_counter == 0) { + printk(KERN_CONT "No response."); + } + else if (datagram->working_counter > 1) { + printk(KERN_CONT "%u slaves responded!", datagram->working_counter); + } + else { + printk(KERN_CONT "Success."); + } + printk(KERN_CONT "\n"); } /*****************************************************************************/ diff --git a/master/domain.c b/master/domain.c index a1ec9b8c..497ccad8 100644 --- a/master/domain.c +++ b/master/domain.c @@ -624,19 +624,19 @@ void ecrt_domain_process(ec_domain_t *domain) } #if EC_MAX_NUM_DEVICES > 1 if (ec_master_num_devices(domain->master) > 1) { - printk(" ("); + printk(KERN_CONT " ("); for (dev_idx = EC_DEVICE_MAIN; dev_idx < ec_master_num_devices(domain->master); dev_idx++) { - printk("%u", domain->working_counter[dev_idx]); + printk(KERN_CONT "%u", domain->working_counter[dev_idx]); if (dev_idx + 1 < ec_master_num_devices(domain->master)) { - printk("+"); + printk(KERN_CONT "+"); } } - printk(")"); + printk(KERN_CONT ")"); } #endif - printk(".\n"); + printk(KERN_CONT ".\n"); domain->working_counter_changes = 0; } diff --git a/master/ethernet.c b/master/ethernet.c index 30de578b..bd196f0f 100644 --- a/master/ethernet.c +++ b/master/ethernet.c @@ -285,23 +285,24 @@ int ec_eoe_send(ec_eoe_t *eoe /**< EoE handler */) } #if EOE_DEBUG_LEVEL >= 2 - EC_SLAVE_DBG(slave, 0, "EoE %s TX sending fragment %u%s" - " with %u octets (%u). %u frames queued.\n", + EC_SLAVE_DBG(eoe->slave, 0, "EoE %s TX sending fragment %u%s" + " with %zu octets (%zu). %u frames queued.\n", eoe->dev->name, eoe->tx_fragment_number, last_fragment ? "" : "+", current_size, complete_offset, eoe->tx_queued_frames); #endif #if EOE_DEBUG_LEVEL >= 3 - EC_SLAVE_DBG(master, 0, ""); + EC_SLAVE_DBG(eoe->slave, 0, ""); for (i = 0; i < current_size; i++) { - printk("%02X ", eoe->tx_frame->skb->data[eoe->tx_offset + i]); + printk(KERN_CONT "%02X ", + eoe->tx_frame->skb->data[eoe->tx_offset + i]); if ((i + 1) % 16 == 0) { - printk("\n"); - EC_SLAVE_DBG(master, 0, ""); + printk(KERN_CONT "\n"); + EC_SLAVE_DBG(eoe->slave, 0, ""); } } - printk("\n"); + printk(KERN_CONT "\n"); #endif data = ec_slave_mbox_prepare_send(eoe->slave, &eoe->datagram, @@ -527,13 +528,13 @@ void ec_eoe_state_rx_fetch(ec_eoe_t *eoe /**< EoE handler */) #if EOE_DEBUG_LEVEL >= 3 EC_SLAVE_DBG(eoe->slave, 0, ""); for (i = 0; i < rec_size - 4; i++) { - printk("%02X ", data[i + 4]); + printk(KERN_CONT "%02X ", data[i + 4]); if ((i + 1) % 16 == 0) { - printk("\n"); + printk(KERN_CONT "\n"); EC_SLAVE_DBG(eoe->slave, 0, ""); } } - printk("\n"); + printk(KERN_CONT "\n"); #endif data_size = time_appended ? rec_size - 8 : rec_size - 4; diff --git a/master/fsm_foe.c b/master/fsm_foe.c index 2e889699..dd84389c 100644 --- a/master/fsm_foe.c +++ b/master/fsm_foe.c @@ -843,11 +843,12 @@ void ec_fsm_foe_state_data_read( // no more data fits into the delivered buffer // ... wait for new read request EC_SLAVE_ERR(slave, "Data do not fit in receive buffer!\n"); - printk(" rx_buffer_size = %d\n", fsm->rx_buffer_size); - printk("rx_buffer_offset = %d\n", fsm->rx_buffer_offset); - printk(" rec_size = %zd\n", rec_size); - printk(" rx_mailbox_size = %d\n", slave->configured_rx_mailbox_size); - printk(" rx_last_packet = %d\n", fsm->rx_last_packet); + printk(KERN_CONT " rx_buffer_size = %d\n", fsm->rx_buffer_size); + printk(KERN_CONT "rx_buffer_offset = %d\n", fsm->rx_buffer_offset); + printk(KERN_CONT " rec_size = %zd\n", rec_size); + printk(KERN_CONT " rx_mailbox_size = %d\n", + slave->configured_rx_mailbox_size); + printk(KERN_CONT " rx_last_packet = %d\n", fsm->rx_last_packet); fsm->request->result = FOE_READY; } } diff --git a/master/fsm_pdo.c b/master/fsm_pdo.c index d6fe964a..1b339643 100644 --- a/master/fsm_pdo.c +++ b/master/fsm_pdo.c @@ -105,11 +105,11 @@ void ec_fsm_pdo_print( ec_fsm_pdo_t *fsm /**< PDO configuration state machine. */ ) { - printk("Currently assigned PDOs: "); + printk(KERN_CONT "Currently assigned PDOs: "); ec_pdo_list_print(&fsm->sync->pdos); - printk(". PDOs to assign: "); + printk(KERN_CONT ". PDOs to assign: "); ec_pdo_list_print(&fsm->pdos); - printk("\n"); + printk(KERN_CONT "\n"); } /*****************************************************************************/ @@ -544,11 +544,11 @@ void ec_fsm_pdo_conf_action_check_mapping( EC_SLAVE_WARN(fsm->slave, "Slave does not support" " changing the PDO mapping!\n"); EC_SLAVE_WARN(fsm->slave, ""); - printk("Currently mapped PDO entries: "); + printk(KERN_CONT "Currently mapped PDO entries: "); ec_pdo_print_entries(&fsm->slave_pdo); - printk(". Entries to map: "); + printk(KERN_CONT ". Entries to map: "); ec_pdo_print_entries(fsm->pdo); - printk("\n"); + printk(KERN_CONT "\n"); } ec_fsm_pdo_conf_action_next_pdo_mapping(fsm, datagram); diff --git a/master/fsm_pdo_entry.c b/master/fsm_pdo_entry.c index 16208d26..48afa1c2 100644 --- a/master/fsm_pdo_entry.c +++ b/master/fsm_pdo_entry.c @@ -93,11 +93,11 @@ void ec_fsm_pdo_entry_print( ec_fsm_pdo_entry_t *fsm /**< PDO mapping state machine. */ ) { - printk("Currently mapped PDO entries: "); + printk(KERN_CONT "Currently mapped PDO entries: "); ec_pdo_print_entries(fsm->cur_pdo); - printk(". Entries to map: "); + printk(KERN_CONT ". Entries to map: "); ec_pdo_print_entries(fsm->source_pdo); - printk("\n"); + printk(KERN_CONT "\n"); } /*****************************************************************************/ diff --git a/master/fsm_soe.c b/master/fsm_soe.c index 00d39faf..711202cf 100644 --- a/master/fsm_soe.c +++ b/master/fsm_soe.c @@ -202,12 +202,12 @@ void ec_fsm_soe_print_error(ec_fsm_soe_t *fsm /**< Finite state machine */) EC_SLAVE_ERR(fsm->slave, ""); if (request->dir == EC_DIR_OUTPUT) { - printk("Writing"); + printk(KERN_CONT "Writing"); } else { - printk("Reading"); + printk(KERN_CONT "Reading"); } - printk(" IDN 0x%04X failed.\n", request->idn); + printk(KERN_CONT " IDN 0x%04X failed.\n", request->idn); } /****************************************************************************** diff --git a/master/mailbox.c b/master/mailbox.c index 10f47698..da8affc0 100644 --- a/master/mailbox.c +++ b/master/mailbox.c @@ -190,13 +190,14 @@ uint8_t *ec_slave_mbox_fetch(const ec_slave_t *slave, /**< slave */ for (mbox_msg = mbox_error_messages; mbox_msg->code; mbox_msg++) { if (mbox_msg->code != code) continue; - printk("Code 0x%04X: \"%s\".\n", + printk(KERN_CONT "Code 0x%04X: \"%s\".\n", mbox_msg->code, mbox_msg->message); break; } - if (!mbox_msg->code) - printk("Unknown error reply code 0x%04X.\n", code); + if (!mbox_msg->code) { + printk(KERN_CONT "Unknown error reply code 0x%04X.\n", code); + } if (slave->master->debug_level) ec_print_data(datagram->data + EC_MBOX_HEADER_SIZE, data_size); diff --git a/master/module.c b/master/module.c index 573a6949..1c3377cd 100644 --- a/master/module.c +++ b/master/module.c @@ -346,20 +346,20 @@ void ec_print_data(const uint8_t *data, /**< pointer to data */ EC_DBG(""); for (i = 0; i < size; i++) { - printk("%02X ", data[i]); + printk(KERN_CONT "%02X ", data[i]); if ((i + 1) % 16 == 0 && i < size - 1) { - printk("\n"); + printk(KERN_CONT "\n"); EC_DBG(""); } if (i + 1 == 128 && size > 256) { - printk("dropped %zu bytes\n", size - 128 - i); + printk(KERN_CONT "dropped %zu bytes\n", size - 128 - i); i = size - 128; EC_DBG(""); } } - printk("\n"); + printk(KERN_CONT "\n"); } /*****************************************************************************/ @@ -375,14 +375,18 @@ void ec_print_data_diff(const uint8_t *d1, /**< first data */ EC_DBG(""); for (i = 0; i < size; i++) { - if (d1[i] == d2[i]) printk(".. "); - else printk("%02X ", d2[i]); + if (d1[i] == d2[i]) { + printk(KERN_CONT ".. "); + } + else { + printk(KERN_CONT "%02X ", d2[i]); + } if ((i + 1) % 16 == 0) { - printk("\n"); + printk(KERN_CONT "\n"); EC_DBG(""); } } - printk("\n"); + printk(KERN_CONT "\n"); } /*****************************************************************************/ diff --git a/master/pdo.c b/master/pdo.c index 1597835c..d9dc5ab9 100644 --- a/master/pdo.c +++ b/master/pdo.c @@ -303,13 +303,13 @@ void ec_pdo_print_entries( const ec_pdo_entry_t *entry; if (list_empty(&pdo->entries)) { - printk("(none)"); + printk(KERN_CONT "(none)"); } else { list_for_each_entry(entry, &pdo->entries, list) { - printk("0x%04X:%02X/%u", + printk(KERN_CONT "0x%04X:%02X/%u", entry->index, entry->subindex, entry->bit_length); if (entry->list.next != &pdo->entries) - printk(" "); + printk(KERN_CONT " "); } } } diff --git a/master/pdo_list.c b/master/pdo_list.c index dbff6052..b0e2e2a1 100644 --- a/master/pdo_list.c +++ b/master/pdo_list.c @@ -333,12 +333,12 @@ void ec_pdo_list_print( const ec_pdo_t *pdo; if (list_empty(&pl->list)) { - printk("(none)"); + printk(KERN_CONT "(none)"); } else { list_for_each_entry(pdo, &pl->list, list) { - printk("0x%04X", pdo->index); + printk(KERN_CONT "0x%04X", pdo->index); if (pdo->list.next != &pl->list) - printk(" "); + printk(KERN_CONT " "); } } }