Commit 8e0f295e authored by Joe Perches's avatar Joe Perches Committed by Michael Grzeschik

arcnet: Add com9026.h to standardize COM9026_REG_<foo>

Deduplicate the COM9026 registers.
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarMichael Grzeschik <m.grzeschik@pengutronix.de>
parent e15b0362
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
#include <linux/io.h> #include <linux/io.h>
#include "arcdevice.h" #include "arcdevice.h"
#include "com9026.h"
/* Internal function declarations */ /* Internal function declarations */
...@@ -59,18 +60,6 @@ static void arcrimi_copy_from_card(struct net_device *dev, int bufnum, ...@@ -59,18 +60,6 @@ static void arcrimi_copy_from_card(struct net_device *dev, int bufnum,
#define BUFFER_SIZE (512) #define BUFFER_SIZE (512)
#define MIRROR_SIZE (BUFFER_SIZE * 4) #define MIRROR_SIZE (BUFFER_SIZE * 4)
/* COM 9026 controller chip --> ARCnet register addresses */
#define COM9026_REG_W_INTMASK 0 /* writable */
#define COM9026_REG_R_STATUS 0 /* readable */
#define COM9026_REG_W_COMMAND 1 /* writable, returns random vals on read (?) */
#define COM9026_REG_RW_CONFIG 2 /* Configuration register */
#define COM9026_REG_R_RESET 8 /* software reset (on read) */
#define COM9026_REG_RW_MEMDATA 12 /* Data port for IO-mapped memory */
#define COM9026_REG_W_ADDR_LO 14 /* Control registers for said */
#define COM9026_REG_W_ADDR_HI 15
#define COM9026_REG_R_STATION 1 /* Station ID */
/* We cannot probe for a RIM I card; one reason is I don't know how to reset /* We cannot probe for a RIM I card; one reason is I don't know how to reset
* them. In fact, we can't even get their node ID automatically. So, we * them. In fact, we can't even get their node ID automatically. So, we
* need to be passed a specific shmem address, IRQ, and node ID. * need to be passed a specific shmem address, IRQ, and node ID.
......
...@@ -53,6 +53,7 @@ ...@@ -53,6 +53,7 @@
#include <linux/jiffies.h> #include <linux/jiffies.h>
#include "arcdevice.h" #include "arcdevice.h"
#include "com9026.h"
/* "do nothing" functions for protocol drivers */ /* "do nothing" functions for protocol drivers */
static void null_rx(struct net_device *dev, int bufnum, static void null_rx(struct net_device *dev, int bufnum,
......
#ifndef __COM9026_H
#define __COM9026_H
/* COM 9026 controller chip --> ARCnet register addresses */
#define COM9026_REG_W_INTMASK 0 /* writable */
#define COM9026_REG_R_STATUS 0 /* readable */
#define COM9026_REG_W_COMMAND 1 /* writable, returns random vals on read (?) */
#define COM9026_REG_RW_CONFIG 2 /* Configuration register */
#define COM9026_REG_R_RESET 8 /* software reset (on read) */
#define COM9026_REG_RW_MEMDATA 12 /* Data port for IO-mapped memory */
#define COM9026_REG_W_ADDR_LO 14 /* Control registers for said */
#define COM9026_REG_W_ADDR_HI 15
#define COM9026_REG_R_STATION 1 /* Station ID */
#endif
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
#include <linux/io.h> #include <linux/io.h>
#include "arcdevice.h" #include "arcdevice.h"
#include "com9026.h"
/* Internal function declarations */ /* Internal function declarations */
...@@ -58,16 +59,6 @@ static void com90io_copy_from_card(struct net_device *dev, int bufnum, ...@@ -58,16 +59,6 @@ static void com90io_copy_from_card(struct net_device *dev, int bufnum,
/* The number of low I/O ports used by the card. */ /* The number of low I/O ports used by the card. */
#define ARCNET_TOTAL_SIZE 16 #define ARCNET_TOTAL_SIZE 16
/* COM 9026 controller chip --> ARCnet register addresses */
#define COM9026_REG_W_INTMASK 0 /* writable */
#define COM9026_REG_R_STATUS 0 /* readable */
#define COM9026_REG_W_COMMAND 1 /* writable, returns random vals on read (?) */
#define COM9026_REG_RW_CONFIG 2 /* Configuration register */
#define COM9026_REG_R_RESET 8 /* software reset (on read) */
#define COM9026_REG_RW_MEMDATA 12 /* Data port for IO-mapped memory */
#define COM9026_REG_W_ADDR_LO 14 /* Control registers for said */
#define COM9026_REG_W_ADDR_HI 15
/**************************************************************************** /****************************************************************************
* * * *
* IO-mapped operation routines * * IO-mapped operation routines *
......
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
#include <linux/io.h> #include <linux/io.h>
#include "arcdevice.h" #include "arcdevice.h"
#include "com9026.h"
/* Define this to speed up the autoprobe by assuming if only one io port and /* Define this to speed up the autoprobe by assuming if only one io port and
* shmem are left in the list at Stage 5, they must correspond to each * shmem are left in the list at Stage 5, they must correspond to each
...@@ -78,18 +79,6 @@ static int numcards; ...@@ -78,18 +79,6 @@ static int numcards;
#define BUFFER_SIZE (512) #define BUFFER_SIZE (512)
#define MIRROR_SIZE (BUFFER_SIZE * 4) #define MIRROR_SIZE (BUFFER_SIZE * 4)
/* COM 9026 controller chip --> ARCnet register addresses */
#define COM9026_REG_W_INTMASK 0 /* writable */
#define COM9026_REG_R_STATUS 0 /* readable */
#define COM9026_REG_W_COMMAND 1 /* writable, returns random vals on read (?) */
#define COM9026_REG_RW_CONFIG 2 /* Configuration register */
#define COM9026_REG_R_RESET 8 /* software reset (on read) */
#define COM9026_REG_RW_MEMDATA 12 /* Data port for IO-mapped memory */
#define COM9026_REG_W_ADDR_LO 14 /* Control registers for said */
#define COM9026_REG_W_ADDR_HI 15
#define COM9026_REG_R_STATION 1 /* Station ID */
static int com90xx_skip_probe __initdata = 0; static int com90xx_skip_probe __initdata = 0;
/* Module parameters */ /* Module parameters */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment