Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 622ed7e9 authored by Wolfram Sang's avatar Wolfram Sang Committed by David S. Miller
Browse files

net/can/mscan: move defines into .h file 



Signed-off-by: default avatarWolfram Sang <w.sang@pengutronix.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a2bfbc07

drivers/net/can/mscan/mscan.c

+0 −29
Original line number Original line Diff line number Diff line
@@ -35,31 +35,6 @@ 




#include "mscan.h"

#include "mscan.h"





#define MSCAN_NORMAL_MODE	0

#define MSCAN_SLEEP_MODE	MSCAN_SLPRQ

#define MSCAN_INIT_MODE		(MSCAN_INITRQ | MSCAN_SLPRQ)

#define MSCAN_POWEROFF_MODE	(MSCAN_CSWAI | MSCAN_SLPRQ)

#define MSCAN_SET_MODE_RETRIES	255

#define MSCAN_ECHO_SKB_MAX	3



#define BTR0_BRP_MASK		0x3f

#define BTR0_SJW_SHIFT		6

#define BTR0_SJW_MASK		(0x3 << BTR0_SJW_SHIFT)



#define BTR1_TSEG1_MASK 	0xf

#define BTR1_TSEG2_SHIFT	4

#define BTR1_TSEG2_MASK 	(0x7 << BTR1_TSEG2_SHIFT)

#define BTR1_SAM_SHIFT  	7



#define BTR0_SET_BRP(brp)	(((brp) - 1) & BTR0_BRP_MASK)

#define BTR0_SET_SJW(sjw)	((((sjw) - 1) << BTR0_SJW_SHIFT) & \

				 BTR0_SJW_MASK)



#define BTR1_SET_TSEG1(tseg1)	(((tseg1) - 1) &  BTR1_TSEG1_MASK)

#define BTR1_SET_TSEG2(tseg2)	((((tseg2) - 1) << BTR1_TSEG2_SHIFT) & \

				 BTR1_TSEG2_MASK)

#define BTR1_SET_SAM(sam)	((sam) ? 1 << BTR1_SAM_SHIFT : 0)



static struct can_bittiming_const mscan_bittiming_const = {

static struct can_bittiming_const mscan_bittiming_const = {

	.name = "mscan",

	.name = "mscan",

	.tseg1_min = 4,

	.tseg1_min = 4,
@@ -78,10 +53,6 @@ struct mscan_state { 
	u8 cantier;

	u8 cantier;

};

};





#define F_RX_PROGRESS	0

#define F_TX_PROGRESS	1

#define F_TX_WAIT_ALL	2



static enum can_state state_map[] = {

static enum can_state state_map[] = {

	CAN_STATE_ERROR_ACTIVE,

	CAN_STATE_ERROR_ACTIVE,

	CAN_STATE_ERROR_WARNING,

	CAN_STATE_ERROR_WARNING,

drivers/net/can/mscan/mscan.h

+29 −0
Original line number Original line Diff line number Diff line
@@ -226,6 +226,35 @@ struct mscan_regs { 
#undef _MSCAN_RESERVED_

#undef _MSCAN_RESERVED_

#define MSCAN_REGION 	sizeof(struct mscan)

#define MSCAN_REGION 	sizeof(struct mscan)





#define MSCAN_NORMAL_MODE	0

#define MSCAN_SLEEP_MODE	MSCAN_SLPRQ

#define MSCAN_INIT_MODE		(MSCAN_INITRQ | MSCAN_SLPRQ)

#define MSCAN_POWEROFF_MODE	(MSCAN_CSWAI | MSCAN_SLPRQ)

#define MSCAN_SET_MODE_RETRIES	255

#define MSCAN_ECHO_SKB_MAX	3



#define BTR0_BRP_MASK		0x3f

#define BTR0_SJW_SHIFT		6

#define BTR0_SJW_MASK		(0x3 << BTR0_SJW_SHIFT)



#define BTR1_TSEG1_MASK 	0xf

#define BTR1_TSEG2_SHIFT	4

#define BTR1_TSEG2_MASK 	(0x7 << BTR1_TSEG2_SHIFT)

#define BTR1_SAM_SHIFT  	7



#define BTR0_SET_BRP(brp)	(((brp) - 1) & BTR0_BRP_MASK)

#define BTR0_SET_SJW(sjw)	((((sjw) - 1) << BTR0_SJW_SHIFT) & \

				 BTR0_SJW_MASK)



#define BTR1_SET_TSEG1(tseg1)	(((tseg1) - 1) &  BTR1_TSEG1_MASK)

#define BTR1_SET_TSEG2(tseg2)	((((tseg2) - 1) << BTR1_TSEG2_SHIFT) & \

				 BTR1_TSEG2_MASK)

#define BTR1_SET_SAM(sam)	((sam) ? 1 << BTR1_SAM_SHIFT : 0)



#define F_RX_PROGRESS	0

#define F_TX_PROGRESS	1

#define F_TX_WAIT_ALL	2



#define TX_QUEUE_SIZE	3

#define TX_QUEUE_SIZE	3





struct tx_queue_entry {

struct tx_queue_entry {