#include <linux/module.h>
#include <linux/moduleparam.h>
-#include <asm/system.h>
#include <linux/uaccess.h>
#include <linux/bitops.h>
#include <linux/string.h>
#define SLLIN_MAGIC 0x53CA
/* #define BREAK_BY_BAUD */
-static int master = true;
+static bool master = true;
static int baudrate; /* Use LIN_DEFAULT_BAUDRATE when not set */
module_param(master, bool, 0);
} while (unlikely(test_bit(SLF_TXBUFF_RQ, &sl->flags)));
if ((remains > 0) && (actual >= 0)) {
- pr_debug("sllin: sllin_write_wakeup sent %d, "
- "remains %d, waiting\n",
+ netdev_dbg(sl->dev, "sllin_write_wakeup sent %d, remains %d, waiting\n",
sl->tx_cnt, sl->tx_lim - sl->tx_cnt);
return;
}
set_bit(SLF_TXEVENT, &sl->flags);
wake_up(&sl->kwt_wq);
- pr_debug("sllin: sllin_write_wakeup sent %d, wakeup\n", sl->tx_cnt);
+ netdev_dbg(sl->dev, "sllin_write_wakeup sent %d, wakeup\n", sl->tx_cnt);
}
/**
spin_lock(&sl->lock);
if (!netif_running(dev)) {
- printk(KERN_WARNING "%s: xmit: iface is down\n", dev->name);
+ netdev_warn(sl->dev, "xmit: iface is down\n");
goto err_out_unlock;
}
if (sl->tty == NULL) {
- printk(KERN_WARNING "%s: xmit: no tty device connected\n", dev->name);
+ netdev_warn(sl->dev, "xmit: no tty device connected\n");
goto err_out_unlock;
}
{
struct sllin *sl = netdev_priv(dev);
- pr_debug("sllin: %s() invoked\n", __func__);
+ netdev_dbg(sl->dev, "%s() invoked\n", __func__);
if (sl->tty == NULL)
return -ENODEV;
/* New-style flags. */
dev->flags = IFF_NOARP;
- dev->features = NETIF_F_NO_CSUM;
+ dev->features = NETIF_F_HW_CSUM; /* NETIF_F_NO_CSUM;*/
}
/******************************************
/* Read the characters out of the buffer */
while (count--) {
if (fp && *fp++) {
- pr_debug("sllin: sllin_receive_buf char 0x%02x ignored "
+ netdev_dbg(sl->dev, "sllin_master_receive_buf char 0x%02x ignored "
"due marker 0x%02x, flags 0x%lx\n",
*cp, *(fp-1), sl->flags);
#ifndef BREAK_BY_BAUD
/* We didn't receive Break character -- fake it! */
if ((sl->rx_cnt == SLLIN_BUFF_BREAK) && (*cp == 0x55)) {
- pr_debug("sllin: LIN_RX[%d]: 0x00\n", sl->rx_cnt);
+ netdev_dbg(sl->dev, "LIN_RX[%d]: 0x00\n", sl->rx_cnt);
sl->rx_buff[sl->rx_cnt++] = 0x00;
}
#endif /* BREAK_BY_BAUD */
if (sl->rx_cnt < SLLIN_BUFF_LEN) {
- pr_debug("sllin: LIN_RX[%d]: 0x%02x\n", sl->rx_cnt, *cp);
+ netdev_dbg(sl->dev, "LIN_RX[%d]: 0x%02x\n", sl->rx_cnt, *cp);
sl->rx_buff[sl->rx_cnt++] = *cp++;
}
}
if (sl->rx_cnt >= sl->rx_expect) {
set_bit(SLF_RXEVENT, &sl->flags);
wake_up(&sl->kwt_wq);
- pr_debug("sllin: sllin_receive_buf count %d, wakeup\n", sl->rx_cnt);
+ netdev_dbg(sl->dev, "sllin_receive_buf count %d, wakeup\n", sl->rx_cnt);
} else {
- pr_debug("sllin: sllin_receive_buf count %d, waiting\n", sl->rx_cnt);
+ netdev_dbg(sl->dev, "sllin_receive_buf count %d, waiting\n", sl->rx_cnt);
}
}
/* Read the characters out of the buffer */
while (count--) {
if (fp && *fp++) {
- pr_debug("sllin: sllin_receive_buf char 0x%02x ignored "
+ 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);
}
if (sl->rx_cnt < SLLIN_BUFF_LEN) {
- pr_debug("sllin: LIN_RX[%d]: 0x%02x\n", sl->rx_cnt, *cp);
+ 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;
- sl->rx_buff[sl->rx_cnt++] = 0x55;
- cp++;
}
if (sl->rx_cnt == SLLIN_BUFF_SYNC) {
/* 'Duplicated' break character -- ignore */
- if ((*cp == 0x00) && (*(cp + 1) == 0x55)) {
+ if (*cp == 0x00) {
cp++;
continue;
}
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_LOC_SLAVE_CACHE) {
- sl->rx_expect += sce->dlc;
+ 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 */
spin_unlock_irqrestore(&sl->linfr_lock, flags);
sl->header_received = true;
+
sll_send_rtr(sl);
continue;
}
((sl->rx_len_unknown == true) && (count == 0)))) {
sll_bump(sl);
- pr_debug("sllin: Received LIN header & LIN response. "
+ netdev_dbg(sl->dev, "Received LIN header & LIN response. "
"rx_cnt = %u, rx_expect = %u\n", sl->rx_cnt,
sl->rx_expect);
const unsigned char *cp, char *fp, int count)
{
struct sllin *sl = (struct sllin *) tty->disc_data;
- pr_debug("sllin: sllin_receive_buf invoked, count = %u\n", count);
+ netdev_dbg(sl->dev, "sllin_receive_buf invoked, count = %u\n", count);
if (!sl || sl->magic != SLLIN_MAGIC || !netif_running(sl->dev))
return;
* @sl:
* @err: Error flag to be sent.
*/
-void sllin_report_error(struct sllin *sl, int err)
+static void sllin_report_error(struct sllin *sl, int err)
{
switch (err) {
case LIN_ERR_CHECKSUM:
unsigned long flags;
struct sllin_conf_entry *sce;
- if (!(cf->can_id & LIN_ID_CONF))
+ if (!(cf->can_id & LIN_CTRL_FRAME))
return -1;
sce = &sl->linfr_cache[cf->can_id & LIN_ID_MASK];
- pr_debug("sllin: Setting frame cache with EFF CAN frame. "
- "LIN ID = %d\n", cf->can_id & LIN_ID_MASK);
+ netdev_dbg(sl->dev, "Setting frame cache with EFF CAN frame. LIN ID = %d\n",
+ cf->can_id & LIN_ID_MASK);
spin_lock_irqsave(&sl->linfr_lock, flags);
#define SLLIN_STPMSG_CHCKSUM_CLS (1 << 1)
#define SLLIN_STPMSG_CHCKSUM_ENH (1 << 2)
-int sllin_setup_msg(struct sllin *sl, int mode, int id,
+static int sllin_setup_msg(struct sllin *sl, int mode, int id,
unsigned char *data, int len)
{
if (id > LIN_ID_MASK)
if ((data != NULL) && len) {
sl->tx_lim += len;
memcpy(sl->tx_buff + SLLIN_BUFF_DATA, data, len);
- sl->tx_buff[sl->tx_lim++] = sllin_checksum(sl->tx_buff,
+ sl->tx_buff[sl->tx_lim] = sllin_checksum(sl->tx_buff,
sl->tx_lim, mode & SLLIN_STPMSG_CHCKSUM_ENH);
+ sl->tx_lim++;
}
if (len != 0)
sl->rx_lim = SLLIN_BUFF_DATA + len + 1;
sl->data_to_send = false;
}
-int sllin_send_tx_buff(struct sllin *sl)
+static int sllin_send_tx_buff(struct sllin *sl)
{
struct tty_struct *tty = sl->tty;
int remains;
sl->tx_cnt += res;
}
- pr_debug("sllin: sllin_send_tx_buff sent %d, remains %d\n",
+ netdev_dbg(sl->dev, "sllin_send_tx_buff sent %d, remains %d\n",
sl->tx_cnt, remains);
clear_bit(SLF_TXBUFF_INPR, &sl->flags);
}
#ifdef BREAK_BY_BAUD
-int sllin_send_break(struct sllin *sl)
+static int sllin_send_break(struct sllin *sl)
{
struct tty_struct *tty = sl->tty;
unsigned long break_baud;
}
#else /* BREAK_BY_BAUD */
-int sllin_send_break(struct sllin *sl)
+static int sllin_send_break(struct sllin *sl)
{
struct tty_struct *tty = sl->tty;
int retval;
sl->tx_cnt = SLLIN_BUFF_SYNC;
- pr_debug("sllin: Break sent.\n");
+ netdev_dbg(sl->dev, "Break sent.\n");
set_bit(SLF_RXEVENT, &sl->flags);
wake_up(&sl->kwt_wq);
* sllin_kwthread - kernel worker thread
*****************************************/
-int sllin_kwthread(void *ptr)
+static int sllin_kwthread(void *ptr)
{
struct sllin *sl = (struct sllin *)ptr;
struct tty_struct *tty = sl->tty;
int tx_bytes = 0; /* Used for Network statistics */
- pr_debug("sllin: sllin_kwthread started.\n");
+ netdev_dbg(sl->dev, "sllin_kwthread started.\n");
sched_setscheduler(current, SCHED_FIFO, &schparam);
clear_bit(SLF_ERROR, &sl->flags);
&& test_bit(SLF_MSGEVENT, &sl->flags)));
if (test_and_clear_bit(SLF_RXEVENT, &sl->flags)) {
- pr_debug("sllin: sllin_kthread RXEVENT\n");
+ netdev_dbg(sl->dev, "sllin_kthread RXEVENT\n");
}
if (test_and_clear_bit(SLF_ERROR, &sl->flags)) {
unsigned long usleep_range_min;
unsigned long usleep_range_max;
hrtimer_cancel(&sl->rx_timer);
- pr_debug("sllin: sllin_kthread ERROR\n");
+ netdev_dbg(sl->dev, "sllin_kthread ERROR\n");
if (sl->lin_state != SLSTATE_IDLE)
sllin_report_error(sl, LIN_ERR_FRAMING);
}
if (test_and_clear_bit(SLF_TXEVENT, &sl->flags)) {
- pr_debug("sllin: sllin_kthread TXEVENT\n");
+ netdev_dbg(sl->dev, "sllin_kthread TXEVENT\n");
}
if (test_and_clear_bit(SLF_TMOUTEVENT, &sl->flags)) {
- pr_debug("sllin: sllin_kthread TMOUTEVENT\n");
+ netdev_dbg(sl->dev, "sllin_kthread TMOUTEVENT\n");
sllin_reset_buffs(sl);
sl->lin_state = SLSTATE_IDLE;
unsigned long flags;
struct sllin_conf_entry *sce;
- pr_debug("sllin: %s: RTR SFF CAN frame, ID = %x\n",
+ netdev_dbg(sl->dev, "%s: RTR SFF CAN frame, ID = %x\n",
__func__, cf->can_id & LIN_ID_MASK);
sce = &sl->linfr_cache[cf->can_id & LIN_ID_MASK];
spin_lock_irqsave(&sl->linfr_lock, flags);
/* Is there Slave response in linfr_cache to be sent? */
- if ((sce->frame_fl & LIN_LOC_SLAVE_CACHE)
+ if ((sce->frame_fl & LIN_CACHE_RESPONSE)
&& (sce->dlc > 0)) {
- pr_debug("sllin: Sending LIN response from linfr_cache\n");
+ netdev_dbg(sl->dev, "Sending LIN response from linfr_cache\n");
lin_data = sce->data;
lin_dlc = sce->dlc;
spin_unlock_irqrestore(&sl->linfr_lock, flags);
} else { /* SFF NON-RTR CAN frame -> LIN header + LIN response */
- pr_debug("sllin: %s: NON-RTR SFF CAN frame, ID = %x\n",
+ netdev_dbg(sl->dev, "%s: NON-RTR SFF CAN frame, ID = %x\n",
__func__, (int)cf->can_id & LIN_ID_MASK);
lin_data = cf->data;
lin_buff = (sl->lin_master) ? sl->tx_buff : sl->rx_buff;
if (cf->can_id == (lin_buff[SLLIN_BUFF_ID] & LIN_ID_MASK)) {
hrtimer_cancel(&sl->rx_timer);
- pr_debug("sllin: received LIN response in a CAN frame.\n");
+ netdev_dbg(sl->dev, "received LIN response in a CAN frame.\n");
if (sllin_setup_msg(sl, SLLIN_STPMSG_RESPONLY,
cf->can_id & LIN_ID_MASK,
cf->data, cf->can_dlc) != -1) {
continue;
hrtimer_cancel(&sl->rx_timer);
- pr_debug("sllin: response received ID %d len %d\n",
+ netdev_dbg(sl->dev, "response received ID %d len %d\n",
sl->rx_buff[SLLIN_BUFF_ID], sl->rx_cnt - SLLIN_BUFF_DATA - 1);
if (sllin_rx_validate(sl) == -1) {
- pr_debug("sllin: RX validation failed.\n");
+ netdev_dbg(sl->dev, "RX validation failed.\n");
sllin_report_error(sl, LIN_ERR_CHECKSUM);
} else {
/* Send CAN non-RTR frame with data */
- pr_debug("sllin: sending NON-RTR CAN"
- "frame with LIN payload.");
+ netdev_dbg(sl->dev, "sending NON-RTR CAN frame with LIN payload.");
sll_bump(sl); /* send packet to the network layer */
}
hrtimer_cancel(&sl->rx_timer);
sll_bump(sl); /* send packet to the network layer */
- pr_debug("sllin: response sent ID %d len %d\n",
+ netdev_dbg(sl->dev, "response sent ID %d len %d\n",
sl->rx_buff[SLLIN_BUFF_ID], sl->rx_cnt - SLLIN_BUFF_DATA - 1);
sl->id_to_send = false;
}
hrtimer_cancel(&sl->rx_timer);
- pr_debug("sllin: sllin_kwthread stopped.\n");
+ netdev_dbg(sl->dev, "sllin_kwthread stopped.\n");
return 0;
}
{
struct sllin *sl;
int err;
+
pr_debug("sllin: %s() invoked\n", __func__);
if (!capable(CAP_NET_ADMIN))
if (!test_bit(SLF_INUSE, &sl->flags)) {
/* Perform the low-level SLLIN initialization. */
sl->lin_master = master;
-#ifdef DEBUG
if (master)
pr_debug("sllin: Configured as MASTER\n");
else
pr_debug("sllin: Configured as SLAVE\n");
-#endif
sllin_reset_buffs(sl);
sllin_devs = kzalloc(sizeof(struct net_device *)*maxdev, GFP_KERNEL);
if (!sllin_devs) {
- printk(KERN_ERR "sllin: can't allocate sllin device array!\n");
+ pr_err("sllin: can't allocate sllin device array!\n");
return -ENOMEM;
}
/* Fill in our line protocol discipline, and register it */
status = tty_register_ldisc(N_SLLIN, &sll_ldisc);
if (status) {
- printk(KERN_ERR "sllin: can't register line discipline\n");
+ pr_err("sllin: can't register line discipline\n");
kfree(sllin_devs);
}
sl = netdev_priv(dev);
if (sl->tty) {
- printk(KERN_ERR "%s: tty discipline still running\n",
- dev->name);
+ netdev_dbg(sl->dev, "tty discipline still running\n");
/* Intentionally leak the control block. */
dev->destructor = NULL;
}
i = tty_unregister_ldisc(N_SLLIN);
if (i)
- printk(KERN_ERR "sllin: can't unregister ldisc (err %d)\n", i);
+ pr_err("sllin: can't unregister ldisc (err %d)\n", i);
}
module_init(sllin_init);
projects / linux-lin.git / blobdiff