OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

maple: fix up whitespace damage. 

This patch is fundamentally about fixing up the whitespace problems
introduced by my previous patch (that brought the code into mainline). A
second patch will follow that will fix memory leaks. The two need to be
applied sequentially.

Signed-off-by: Adrian McMenamin <adrian@mcmen.demon.co.uk>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Adrian McMenamin 2008-02-06 22:46:21 +00:00 committed by Paul Mundt
parent 86c0179c93
commit b948237891
2 changed files with 496 additions and 489 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

884
drivers/sh/maple/maple.c
View File

File diff suppressed because it is too large Load Diff

101
include/linux/maple.h
View File

@ -7,74 +7,75 @@ extern struct bus_type maple_bus_type;
/* Maple Bus command and response codes */ /* Maple Bus command and response codes */
enum maple_code { enum maple_code {
MAPLE_RESPONSE_FILEERR = -5, MAPLE_RESPONSE_FILEERR = -5,
MAPLE_RESPONSE_AGAIN = -4, /* request should be retransmitted */ MAPLE_RESPONSE_AGAIN = -4, /* request should be retransmitted */
MAPLE_RESPONSE_BADCMD = -3, MAPLE_RESPONSE_BADCMD = -3,
MAPLE_RESPONSE_BADFUNC = -2, MAPLE_RESPONSE_BADFUNC = -2,
MAPLE_RESPONSE_NONE = -1, /* unit didn't respond at all */ MAPLE_RESPONSE_NONE = -1, /* unit didn't respond at all */
MAPLE_COMMAND_DEVINFO = 1, MAPLE_COMMAND_DEVINFO = 1,
MAPLE_COMMAND_ALLINFO = 2, MAPLE_COMMAND_ALLINFO = 2,
MAPLE_COMMAND_RESET = 3, MAPLE_COMMAND_RESET = 3,
MAPLE_COMMAND_KILL = 4, MAPLE_COMMAND_KILL = 4,
MAPLE_RESPONSE_DEVINFO = 5, MAPLE_RESPONSE_DEVINFO = 5,
MAPLE_RESPONSE_ALLINFO = 6, MAPLE_RESPONSE_ALLINFO = 6,
MAPLE_RESPONSE_OK = 7, MAPLE_RESPONSE_OK = 7,
MAPLE_RESPONSE_DATATRF = 8, MAPLE_RESPONSE_DATATRF = 8,
MAPLE_COMMAND_GETCOND = 9, MAPLE_COMMAND_GETCOND = 9,
MAPLE_COMMAND_GETMINFO = 10, MAPLE_COMMAND_GETMINFO = 10,
MAPLE_COMMAND_BREAD = 11, MAPLE_COMMAND_BREAD = 11,
MAPLE_COMMAND_BWRITE = 12, MAPLE_COMMAND_BWRITE = 12,
MAPLE_COMMAND_SETCOND = 14 MAPLE_COMMAND_SETCOND = 14
}; };
struct mapleq { struct mapleq {
struct list_head list; struct list_head list;
struct maple_device *dev; struct maple_device *dev;
void *sendbuf, *recvbuf, *recvbufdcsp; void *sendbuf, *recvbuf, *recvbufdcsp;
unsigned char length; unsigned char length;
enum maple_code command; enum maple_code command;
}; };
struct maple_devinfo { struct maple_devinfo {
unsigned long function; unsigned long function;
unsigned long function_data[3]; unsigned long function_data[3];
unsigned char area_code; unsigned char area_code;
unsigned char connector_directon; unsigned char connector_directon;
char product_name[31]; char product_name[31];
char product_licence[61]; char product_licence[61];
unsigned short standby_power; unsigned short standby_power;
unsigned short max_power; unsigned short max_power;
}; };
struct maple_device { struct maple_device {
struct maple_driver *driver; struct maple_driver *driver;
struct mapleq *mq; struct mapleq *mq;
void *private_data; void *private_data;
void (*callback) (struct mapleq * mq); void (*callback) (struct mapleq * mq);
unsigned long when, interval, function; unsigned long when, interval, function;
struct maple_devinfo devinfo; struct maple_devinfo devinfo;
unsigned char port, unit; unsigned char port, unit;
char product_name[32]; char product_name[32];
char product_licence[64]; char product_licence[64];
int registered; int registered;
struct device dev; struct device dev;
}; };
struct maple_driver { struct maple_driver {
unsigned long function; unsigned long function;
int (*connect) (struct maple_device * dev); int (*connect) (struct maple_device * dev);
void (*disconnect) (struct maple_device * dev); void (*disconnect) (struct maple_device * dev);
struct device_driver drv; struct device_driver drv;
int registered;
}; };
void maple_getcond_callback(struct maple_device *dev, void maple_getcond_callback(struct maple_device *dev,
void (*callback) (struct mapleq * mq), void (*callback) (struct mapleq * mq),
unsigned long interval, unsigned long interval,
unsigned long function); unsigned long function);
int maple_driver_register(struct device_driver *drv); int maple_driver_register(struct device_driver *drv);
void maple_add_packet(struct mapleq *mq); void maple_add_packet(struct mapleq *mq);
#define to_maple_dev(n) container_of(n, struct maple_device, dev) #define to_maple_dev(n) container_of(n, struct maple_device, dev)
#define to_maple_driver(n) container_of(n, struct maple_driver, drv) #define to_maple_driver(n) container_of(n, struct maple_driver, drv)
#endif /* __LINUX_MAPLE_H */ #endif /* __LINUX_MAPLE_H */