From: Alexander Stein <alexander.stein@systec-electronic.com>
To: Pavel Pisa <pisa@cmp.felk.cvut.cz>
Cc: "Rostislav Lisový" <lisovy@gmail.com>,
"Michal Sojka" <sojkam1@fel.cvut.cz>,
"Oliver Hartkopp" <oliver.hartkopp@volkswagen.de>,
linux-can@vger.kernel.org,
"Alexander Stein" <alexander.stein@systec-electronic.com>
Subject: [PATCH 01/11] sllin: reorder functions
Date: Mon, 16 Dec 2013 08:54:04 +0100 [thread overview]
Message-ID: <1387180454-1738-2-git-send-email-alexander.stein@systec-electronic.com> (raw)
In-Reply-To: <1387180454-1738-1-git-send-email-alexander.stein@systec-electronic.com>
Needed for further commits
Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com>
---
sllin/sllin.c | 288 +++++++++++++++++++++++++++++-----------------------------
1 file changed, 144 insertions(+), 144 deletions(-)
diff --git a/sllin/sllin.c b/sllin/sllin.c
index b97219e..e8aca08 100644
--- a/sllin/sllin.c
+++ b/sllin/sllin.c
@@ -494,111 +494,6 @@ static void sllin_master_receive_buf(struct tty_struct *tty,
}
-static void sllin_slave_receive_buf(struct tty_struct *tty,
- const unsigned char *cp, char *fp, int count)
-{
- struct sllin *sl = (struct sllin *) tty->disc_data;
- int lin_id;
- struct sllin_conf_entry *sce;
-
-
- /* Read the characters out of the buffer */
- while (count--) {
- if (fp && *fp++) {
- netdev_dbg(sl->dev, "sllin_slave_receive_buf char 0x%02x ignored "
- "due marker 0x%02x, flags 0x%lx\n",
- *cp, *(fp-1), sl->flags);
-
- /* Received Break */
- sl->rx_cnt = 0;
- sl->rx_expect = SLLIN_BUFF_ID + 1;
- sl->rx_len_unknown = false; /* We do know exact length of the header */
- sl->header_received = false;
- }
-
- if (sl->rx_cnt < SLLIN_BUFF_LEN) {
- netdev_dbg(sl->dev, "LIN_RX[%d]: 0x%02x\n", sl->rx_cnt, *cp);
-
- /* We did not receive break (0x00) character */
- if ((sl->rx_cnt == SLLIN_BUFF_BREAK) && (*cp == 0x55)) {
- sl->rx_buff[sl->rx_cnt++] = 0x00;
- }
-
- if (sl->rx_cnt == SLLIN_BUFF_SYNC) {
- /* 'Duplicated' break character -- ignore */
- if (*cp == 0x00) {
- cp++;
- continue;
- }
-
- /* Wrong sync character */
- if (*cp != 0x55)
- break;
- }
-
- sl->rx_buff[sl->rx_cnt++] = *cp++;
- }
-
- /* Header received */
- if ((sl->header_received == false) && (sl->rx_cnt >= (SLLIN_BUFF_ID + 1))) {
- unsigned long flags;
-
- lin_id = sl->rx_buff[SLLIN_BUFF_ID] & LIN_ID_MASK;
- sce = &sl->linfr_cache[lin_id];
-
- spin_lock_irqsave(&sl->linfr_lock, flags);
-
- /* Is the length of data set in frame cache? */
- if (sce->frame_fl & LIN_CACHE_RESPONSE) {
- sl->rx_expect += sce->dlc + 1; /* + checksum */
- sl->rx_len_unknown = false;
- } else {
- sl->rx_expect += SLLIN_DATA_MAX + 1; /* + checksum */
- sl->rx_len_unknown = true;
- }
- spin_unlock_irqrestore(&sl->linfr_lock, flags);
-
- sl->header_received = true;
-
- sll_send_rtr(sl);
- continue;
- }
-
- /* Response received */
- if ((sl->header_received == true) &&
- ((sl->rx_cnt >= sl->rx_expect) ||
- ((sl->rx_len_unknown == true) && (count == 0)))) {
-
- sll_bump(sl);
- netdev_dbg(sl->dev, "Received LIN header & LIN response. "
- "rx_cnt = %u, rx_expect = %u\n", sl->rx_cnt,
- sl->rx_expect);
-
- /* Prepare for reception of new header */
- sl->rx_cnt = 0;
- sl->rx_expect = SLLIN_BUFF_ID + 1;
- sl->rx_len_unknown = false; /* We do know exact length of the header */
- sl->header_received = false;
- }
- }
-}
-
-static void sllin_receive_buf(struct tty_struct *tty,
- const unsigned char *cp, char *fp, int count)
-{
- struct sllin *sl = (struct sllin *) tty->disc_data;
- netdev_dbg(sl->dev, "sllin_receive_buf invoked, count = %u\n", count);
-
- if (!sl || sl->magic != SLLIN_MAGIC || !netif_running(sl->dev))
- return;
-
- if (sl->lin_master)
- sllin_master_receive_buf(tty, cp, fp, count);
- else
- sllin_slave_receive_buf(tty, cp, fp, count);
-
-}
-
/*****************************************
* sllin message helper routines
*****************************************/
@@ -736,6 +631,150 @@ static void sllin_reset_buffs(struct sllin *sl)
sl->data_to_send = false;
}
+/**
+ * sllin_rx_validate() -- Validate received frame, i,e. check checksum
+ *
+ * @sl:
+ */
+static int sllin_rx_validate(struct sllin *sl)
+{
+ unsigned long flags;
+ int actual_id;
+ int ext_chcks_fl;
+ int lin_dlc;
+ unsigned char rec_chcksm = sl->rx_buff[sl->rx_cnt - 1];
+ struct sllin_conf_entry *sce;
+
+ actual_id = sl->rx_buff[SLLIN_BUFF_ID] & LIN_ID_MASK;
+ sce = &sl->linfr_cache[actual_id];
+
+ spin_lock_irqsave(&sl->linfr_lock, flags);
+ lin_dlc = sce->dlc;
+ ext_chcks_fl = sce->frame_fl & LIN_CHECKSUM_EXTENDED;
+ spin_unlock_irqrestore(&sl->linfr_lock, flags);
+
+ if (sllin_checksum(sl->rx_buff, sl->rx_cnt - 1, ext_chcks_fl) !=
+ rec_chcksm) {
+
+ /* Type of checksum is configured for particular frame */
+ if (lin_dlc > 0) {
+ return -1;
+ } else {
+ if (sllin_checksum(sl->rx_buff, sl->rx_cnt - 1,
+ !ext_chcks_fl) != rec_chcksm) {
+ return -1;
+ }
+ }
+ }
+
+ return 0;
+}
+
+static void sllin_slave_receive_buf(struct tty_struct *tty,
+ const unsigned char *cp, char *fp, int count)
+{
+ struct sllin *sl = (struct sllin *) tty->disc_data;
+ int lin_id;
+ struct sllin_conf_entry *sce;
+
+
+ /* Read the characters out of the buffer */
+ while (count--) {
+ if (fp && *fp++) {
+ netdev_dbg(sl->dev, "sllin_slave_receive_buf char 0x%02x ignored "
+ "due marker 0x%02x, flags 0x%lx\n",
+ *cp, *(fp-1), sl->flags);
+
+ /* Received Break */
+ sl->rx_cnt = 0;
+ sl->rx_expect = SLLIN_BUFF_ID + 1;
+ sl->rx_len_unknown = false; /* We do know exact length of the header */
+ sl->header_received = false;
+ }
+
+ if (sl->rx_cnt < SLLIN_BUFF_LEN) {
+ netdev_dbg(sl->dev, "LIN_RX[%d]: 0x%02x\n", sl->rx_cnt, *cp);
+
+ /* We did not receive break (0x00) character */
+ if ((sl->rx_cnt == SLLIN_BUFF_BREAK) && (*cp == 0x55)) {
+ sl->rx_buff[sl->rx_cnt++] = 0x00;
+ }
+
+ if (sl->rx_cnt == SLLIN_BUFF_SYNC) {
+ /* 'Duplicated' break character -- ignore */
+ if (*cp == 0x00) {
+ cp++;
+ continue;
+ }
+
+ /* Wrong sync character */
+ if (*cp != 0x55)
+ break;
+ }
+
+ sl->rx_buff[sl->rx_cnt++] = *cp++;
+ }
+
+ /* Header received */
+ if ((sl->header_received == false) && (sl->rx_cnt >= (SLLIN_BUFF_ID + 1))) {
+ unsigned long flags;
+
+ lin_id = sl->rx_buff[SLLIN_BUFF_ID] & LIN_ID_MASK;
+ sce = &sl->linfr_cache[lin_id];
+
+ spin_lock_irqsave(&sl->linfr_lock, flags);
+
+ /* Is the length of data set in frame cache? */
+ if (sce->frame_fl & LIN_CACHE_RESPONSE) {
+ sl->rx_expect += sce->dlc + 1; /* + checksum */
+ sl->rx_len_unknown = false;
+ } else {
+ sl->rx_expect += SLLIN_DATA_MAX + 1; /* + checksum */
+ sl->rx_len_unknown = true;
+ }
+ spin_unlock_irqrestore(&sl->linfr_lock, flags);
+
+ sl->header_received = true;
+
+ sll_send_rtr(sl);
+ continue;
+ }
+
+ /* Response received */
+ if ((sl->header_received == true) &&
+ ((sl->rx_cnt >= sl->rx_expect) ||
+ ((sl->rx_len_unknown == true) && (count == 0)))) {
+
+ sll_bump(sl);
+ netdev_dbg(sl->dev, "Received LIN header & LIN response. "
+ "rx_cnt = %u, rx_expect = %u\n", sl->rx_cnt,
+ sl->rx_expect);
+
+ /* Prepare for reception of new header */
+ sl->rx_cnt = 0;
+ sl->rx_expect = SLLIN_BUFF_ID + 1;
+ sl->rx_len_unknown = false; /* We do know exact length of the header */
+ sl->header_received = false;
+ }
+ }
+}
+
+static void sllin_receive_buf(struct tty_struct *tty,
+ const unsigned char *cp, char *fp, int count)
+{
+ struct sllin *sl = (struct sllin *) tty->disc_data;
+ netdev_dbg(sl->dev, "sllin_receive_buf invoked, count = %u\n", count);
+
+ if (!sl || sl->magic != SLLIN_MAGIC || !netif_running(sl->dev))
+ return;
+
+ if (sl->lin_master)
+ sllin_master_receive_buf(tty, cp, fp, count);
+ else
+ sllin_slave_receive_buf(tty, cp, fp, count);
+
+}
+
static int sllin_send_tx_buff(struct sllin *sl)
{
struct tty_struct *tty = sl->tty;
@@ -873,45 +912,6 @@ static enum hrtimer_restart sllin_rx_timeout_handler(struct hrtimer *hrtimer)
return HRTIMER_NORESTART;
}
-/**
- * sllin_rx_validate() -- Validate received frame, i,e. check checksum
- *
- * @sl:
- */
-static int sllin_rx_validate(struct sllin *sl)
-{
- unsigned long flags;
- int actual_id;
- int ext_chcks_fl;
- int lin_dlc;
- unsigned char rec_chcksm = sl->rx_buff[sl->rx_cnt - 1];
- struct sllin_conf_entry *sce;
-
- actual_id = sl->rx_buff[SLLIN_BUFF_ID] & LIN_ID_MASK;
- sce = &sl->linfr_cache[actual_id];
-
- spin_lock_irqsave(&sl->linfr_lock, flags);
- lin_dlc = sce->dlc;
- ext_chcks_fl = sce->frame_fl & LIN_CHECKSUM_EXTENDED;
- spin_unlock_irqrestore(&sl->linfr_lock, flags);
-
- if (sllin_checksum(sl->rx_buff, sl->rx_cnt - 1, ext_chcks_fl) !=
- rec_chcksm) {
-
- /* Type of checksum is configured for particular frame */
- if (lin_dlc > 0) {
- return -1;
- } else {
- if (sllin_checksum(sl->rx_buff, sl->rx_cnt - 1,
- !ext_chcks_fl) != rec_chcksm) {
- return -1;
- }
- }
- }
-
- return 0;
-}
-
/*****************************************
* sllin_kwthread - kernel worker thread
*****************************************/
--
1.8.3.2
next prev parent reply other threads:[~2013-12-16 7:55 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-10 17:16 [RFC] WIP-patches on sllin Alexander Stein
2013-12-10 17:16 ` [PATCH 1/6] sllin: Replace pr_* with netdev_* where approriate Alexander Stein
2013-12-10 17:16 ` [PATCH 2/6] sllin: Make local functions static Alexander Stein
2013-12-10 17:16 ` [PATCH 3/6] sllin: slave: don't forget to wait for the checksum Alexander Stein
2013-12-10 17:16 ` [PATCH 4/6] sllin: reorder functions Alexander Stein
2013-12-10 17:16 ` [PATCH 5/6] sllin: If length is unknown read until timer occurs or break is received Alexander Stein
2013-12-10 17:16 ` [PATCH 6/6] sllin: Add first support for LIN slave task on slave node Alexander Stein
2013-12-13 1:00 ` [RFC] WIP-patches on sllin Pavel Pisa
2013-12-16 7:46 ` Alexander Stein
2013-12-16 7:54 ` [RFC v2] " Alexander Stein
2013-12-16 7:54 ` Alexander Stein [this message]
2013-12-16 7:54 ` [PATCH 02/11] sllin: If length is unknown read until timer occurs or break is received Alexander Stein
2013-12-16 7:54 ` [PATCH 03/11] sllin: Add first support for LIN slave task on slave node Alexander Stein
2013-12-16 7:54 ` [PATCH 04/11] sllin: Add version dependent access to termios in tty_struct Alexander Stein
2013-12-16 7:54 ` [PATCH 05/11] sllin: Fix checksum mode decision Alexander Stein
2013-12-16 7:54 ` [PATCH 06/11] sllin: dlc in cache > 0 is the expected LIN frame length Alexander Stein
2013-12-16 7:54 ` [PATCH 07/11] sllin: Do not set SLF_MSGEVENT flag Alexander Stein
2013-12-16 7:54 ` [PATCH 08/11] sllin: signal timeout if there are less than configured characters Alexander Stein
2013-12-16 7:54 ` [PATCH 09/11] sllin: Don't fiddle with netdev queue and skb in slave receive mode Alexander Stein
2013-12-16 7:54 ` [PATCH 10/11] sllin: Add LIN ID to timeout frame Alexander Stein
2013-12-16 7:54 ` [PATCH 11/11] sllin: Evaluate message upon break only if received at least a LIN ID Alexander Stein
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1387180454-1738-2-git-send-email-alexander.stein@systec-electronic.com \
--to=alexander.stein@systec-electronic.com \
--cc=linux-can@vger.kernel.org \
--cc=lisovy@gmail.com \
--cc=oliver.hartkopp@volkswagen.de \
--cc=pisa@cmp.felk.cvut.cz \
--cc=sojkam1@fel.cvut.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox