提交 b9482378 编写于 作者: A Adrian McMenamin 提交者: Paul Mundt

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: NAdrian McMenamin <adrian@mcmen.demon.co.uk>
Signed-off-by: NPaul Mundt <lethal@linux-sh.org>
上级 86c0179c
...@@ -57,8 +57,8 @@ static int started, scanning, liststatus; ...@@ -57,8 +57,8 @@ static int started, scanning, liststatus;
static struct kmem_cache *maple_queue_cache; static struct kmem_cache *maple_queue_cache;
struct maple_device_specify { struct maple_device_specify {
int port; int port;
int unit; int unit;
}; };
/** /**
...@@ -68,22 +68,23 @@ struct maple_device_specify { ...@@ -68,22 +68,23 @@ struct maple_device_specify {
*/ */
int maple_driver_register(struct device_driver *drv) int maple_driver_register(struct device_driver *drv)
{ {
if (!drv) if (!drv)
return -EINVAL; return -EINVAL;
drv->bus = &maple_bus_type; drv->bus = &maple_bus_type;
return driver_register(drv); return driver_register(drv);
} }
EXPORT_SYMBOL_GPL(maple_driver_register); EXPORT_SYMBOL_GPL(maple_driver_register);
/* set hardware registers to enable next round of dma */ /* set hardware registers to enable next round of dma */
static void maplebus_dma_reset(void) static void maplebus_dma_reset(void)
{ {
ctrl_outl(MAPLE_MAGIC, MAPLE_RESET); ctrl_outl(MAPLE_MAGIC, MAPLE_RESET);
/* set trig type to 0 for software trigger, 1 for hardware (VBLANK) */ /* set trig type to 0 for software trigger, 1 for hardware (VBLANK) */
ctrl_outl(1, MAPLE_TRIGTYPE); ctrl_outl(1, MAPLE_TRIGTYPE);
ctrl_outl(MAPLE_2MBPS | MAPLE_TIMEOUT(50000), MAPLE_SPEED); ctrl_outl(MAPLE_2MBPS | MAPLE_TIMEOUT(50000), MAPLE_SPEED);
ctrl_outl(PHYSADDR(maple_sendbuf), MAPLE_DMAADDR); ctrl_outl(PHYSADDR(maple_sendbuf), MAPLE_DMAADDR);
ctrl_outl(1, MAPLE_ENABLE); ctrl_outl(1, MAPLE_ENABLE);
} }
/** /**
...@@ -94,27 +95,28 @@ static void maplebus_dma_reset(void) ...@@ -94,27 +95,28 @@ static void maplebus_dma_reset(void)
* @function: the function code for the device * @function: the function code for the device
*/ */
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 function) unsigned long interval, unsigned long function)
{ {
dev->callback = callback; dev->callback = callback;
dev->interval = interval; dev->interval = interval;
dev->function = cpu_to_be32(function); dev->function = cpu_to_be32(function);
dev->when = jiffies; dev->when = jiffies;
} }
EXPORT_SYMBOL_GPL(maple_getcond_callback); EXPORT_SYMBOL_GPL(maple_getcond_callback);
static int maple_dma_done(void) static int maple_dma_done(void)
{ {
return (ctrl_inl(MAPLE_STATE) & 1) == 0; return (ctrl_inl(MAPLE_STATE) & 1) == 0;
} }
static void maple_release_device(struct device *dev) static void maple_release_device(struct device *dev)
{ {
if (dev->type) { if (dev->type) {
kfree(dev->type->name); kfree(dev->type->name);
kfree(dev->type); kfree(dev->type);
} }
} }
/** /**
...@@ -123,60 +125,61 @@ static void maple_release_device(struct device *dev) ...@@ -123,60 +125,61 @@ static void maple_release_device(struct device *dev)
*/ */
void maple_add_packet(struct mapleq *mq) void maple_add_packet(struct mapleq *mq)
{ {
mutex_lock(&maple_list_lock); mutex_lock(&maple_list_lock);
list_add(&mq->list, &maple_waitq); list_add(&mq->list, &maple_waitq);
mutex_unlock(&maple_list_lock); mutex_unlock(&maple_list_lock);
} }
EXPORT_SYMBOL_GPL(maple_add_packet); EXPORT_SYMBOL_GPL(maple_add_packet);
static struct mapleq *maple_allocq(struct maple_device *dev) static struct mapleq *maple_allocq(struct maple_device *dev)
{ {
struct mapleq *mq; struct mapleq *mq;
mq = kmalloc(sizeof(*mq), GFP_KERNEL); mq = kmalloc(sizeof(*mq), GFP_KERNEL);
if (!mq) if (!mq)
return NULL; return NULL;
mq->dev = dev; mq->dev = dev;
mq->recvbufdcsp = kmem_cache_zalloc(maple_queue_cache, GFP_KERNEL); mq->recvbufdcsp = kmem_cache_zalloc(maple_queue_cache, GFP_KERNEL);
mq->recvbuf = (void *) P2SEGADDR(mq->recvbufdcsp); mq->recvbuf = (void *) P2SEGADDR(mq->recvbufdcsp);
if (!mq->recvbuf) { if (!mq->recvbuf) {
kfree(mq); kfree(mq);
return NULL; return NULL;
} }
return mq; return mq;
} }
static struct maple_device *maple_alloc_dev(int port, int unit) static struct maple_device *maple_alloc_dev(int port, int unit)
{ {
struct maple_device *dev; struct maple_device *dev;
dev = kzalloc(sizeof(*dev), GFP_KERNEL); dev = kzalloc(sizeof(*dev), GFP_KERNEL);
if (!dev) if (!dev)
return NULL; return NULL;
dev->port = port; dev->port = port;
dev->unit = unit; dev->unit = unit;
dev->mq = maple_allocq(dev); dev->mq = maple_allocq(dev);
if (!dev->mq) { if (!dev->mq) {
kfree(dev); kfree(dev);
return NULL; return NULL;
} }
return dev; return dev;
} }
static void maple_free_dev(struct maple_device *mdev) static void maple_free_dev(struct maple_device *mdev)
{ {
if (!mdev) if (!mdev)
return; return;
if (mdev->mq) { if (mdev->mq) {
kmem_cache_free(maple_queue_cache, mdev->mq->recvbufdcsp); kmem_cache_free(maple_queue_cache, mdev->mq->recvbufdcsp);
kfree(mdev->mq); kfree(mdev->mq);
} }
kfree(mdev); kfree(mdev);
} }
/* process the command queue into a maple command block /* process the command queue into a maple command block
...@@ -184,153 +187,153 @@ static void maple_free_dev(struct maple_device *mdev) ...@@ -184,153 +187,153 @@ static void maple_free_dev(struct maple_device *mdev)
*/ */
static void maple_build_block(struct mapleq *mq) static void maple_build_block(struct mapleq *mq)
{ {
int port, unit, from, to, len; int port, unit, from, to, len;
unsigned long *lsendbuf = mq->sendbuf; unsigned long *lsendbuf = mq->sendbuf;
port = mq->dev->port & 3; port = mq->dev->port & 3;
unit = mq->dev->unit; unit = mq->dev->unit;
len = mq->length; len = mq->length;
from = port << 6; from = port << 6;
to = (port << 6) | (unit > 0 ? (1 << (unit - 1)) & 0x1f : 0x20); to = (port << 6) | (unit > 0 ? (1 << (unit - 1)) & 0x1f : 0x20);
*maple_lastptr &= 0x7fffffff; *maple_lastptr &= 0x7fffffff;
maple_lastptr = maple_sendptr; maple_lastptr = maple_sendptr;
*maple_sendptr++ = (port << 16) | len | 0x80000000; *maple_sendptr++ = (port << 16) | len | 0x80000000;
*maple_sendptr++ = PHYSADDR(mq->recvbuf); *maple_sendptr++ = PHYSADDR(mq->recvbuf);
*maple_sendptr++ = *maple_sendptr++ =
mq->command | (to << 8) | (from << 16) | (len << 24); mq->command | (to << 8) | (from << 16) | (len << 24);
while (len-- > 0) while (len-- > 0)
*maple_sendptr++ = *lsendbuf++; *maple_sendptr++ = *lsendbuf++;
} }
/* build up command queue */ /* build up command queue */
static void maple_send(void) static void maple_send(void)
{ {
int i; int i;
int maple_packets; int maple_packets;
struct mapleq *mq, *nmq; struct mapleq *mq, *nmq;
if (!list_empty(&maple_sentq)) if (!list_empty(&maple_sentq))
return; return;
if (list_empty(&maple_waitq) || !maple_dma_done()) if (list_empty(&maple_waitq) || !maple_dma_done())
return; return;
maple_packets = 0; maple_packets = 0;
maple_sendptr = maple_lastptr = maple_sendbuf; maple_sendptr = maple_lastptr = maple_sendbuf;
list_for_each_entry_safe(mq, nmq, &maple_waitq, list) { list_for_each_entry_safe(mq, nmq, &maple_waitq, list) {
maple_build_block(mq); maple_build_block(mq);
list_move(&mq->list, &maple_sentq); list_move(&mq->list, &maple_sentq);
if (maple_packets++ > MAPLE_MAXPACKETS) if (maple_packets++ > MAPLE_MAXPACKETS)
break; break;
} }
if (maple_packets > 0) { if (maple_packets > 0) {
for (i = 0; i < (1 << MAPLE_DMA_PAGES); i++) for (i = 0; i < (1 << MAPLE_DMA_PAGES); i++)
dma_cache_sync(0, maple_sendbuf + i * PAGE_SIZE, dma_cache_sync(0, maple_sendbuf + i * PAGE_SIZE,
PAGE_SIZE, DMA_BIDIRECTIONAL); PAGE_SIZE, DMA_BIDIRECTIONAL);
} }
} }
static int attach_matching_maple_driver(struct device_driver *driver, static int attach_matching_maple_driver(struct device_driver *driver,
void *devptr) void *devptr)
{ {
struct maple_driver *maple_drv; struct maple_driver *maple_drv;
struct maple_device *mdev; struct maple_device *mdev;
mdev = devptr; mdev = devptr;
maple_drv = to_maple_driver(driver); maple_drv = to_maple_driver(driver);
if (mdev->devinfo.function & be32_to_cpu(maple_drv->function)) { if (mdev->devinfo.function & be32_to_cpu(maple_drv->function)) {
if (maple_drv->connect(mdev) == 0) { if (maple_drv->connect(mdev) == 0) {
mdev->driver = maple_drv; mdev->driver = maple_drv;
return 1; return 1;
} }
} }
return 0; return 0;
} }
static void maple_detach_driver(struct maple_device *mdev) static void maple_detach_driver(struct maple_device *mdev)
{ {
if (!mdev) if (!mdev)
return; return;
if (mdev->driver) { if (mdev->driver) {
if (mdev->driver->disconnect) if (mdev->driver->disconnect)
mdev->driver->disconnect(mdev); mdev->driver->disconnect(mdev);
} }
mdev->driver = NULL; mdev->driver = NULL;
if (mdev->registered) { if (mdev->registered) {
maple_release_device(&mdev->dev); maple_release_device(&mdev->dev);
device_unregister(&mdev->dev); device_unregister(&mdev->dev);
} }
mdev->registered = 0; mdev->registered = 0;
maple_free_dev(mdev); maple_free_dev(mdev);
} }
/* process initial MAPLE_COMMAND_DEVINFO for each device or port */ /* process initial MAPLE_COMMAND_DEVINFO for each device or port */
static void maple_attach_driver(struct maple_device *dev) static void maple_attach_driver(struct maple_device *dev)
{ {
char *p; char *p;
char *recvbuf; char *recvbuf;
unsigned long function; unsigned long function;
int matched, retval; int matched, retval;
recvbuf = dev->mq->recvbuf; recvbuf = dev->mq->recvbuf;
memcpy(&dev->devinfo, recvbuf + 4, sizeof(dev->devinfo)); memcpy(&dev->devinfo, recvbuf + 4, sizeof(dev->devinfo));
memcpy(dev->product_name, dev->devinfo.product_name, 30); memcpy(dev->product_name, dev->devinfo.product_name, 30);
memcpy(dev->product_licence, dev->devinfo.product_licence, 60); memcpy(dev->product_licence, dev->devinfo.product_licence, 60);
dev->product_name[30] = '\0'; dev->product_name[30] = '\0';
dev->product_licence[60] = '\0'; dev->product_licence[60] = '\0';
for (p = dev->product_name + 29; dev->product_name <= p; p--) for (p = dev->product_name + 29; dev->product_name <= p; p--)
if (*p == ' ') if (*p == ' ')
*p = '\0'; *p = '\0';
else else
break; break;
for (p = dev->product_licence + 59; dev->product_licence <= p; p--) for (p = dev->product_licence + 59; dev->product_licence <= p; p--)
if (*p == ' ') if (*p == ' ')
*p = '\0'; *p = '\0';
else else
break; break;
function = be32_to_cpu(dev->devinfo.function); function = be32_to_cpu(dev->devinfo.function);
if (function > 0x200) { if (function > 0x200) {
/* Do this silently - as not a real device */ /* Do this silently - as not a real device */
function = 0; function = 0;
dev->driver = &maple_dummy_driver; dev->driver = &maple_dummy_driver;
sprintf(dev->dev.bus_id, "%d:0.port", dev->port); sprintf(dev->dev.bus_id, "%d:0.port", dev->port);
} else { } else {
printk(KERN_INFO printk(KERN_INFO
"Maple bus at (%d, %d): Connected function 0x%lX\n", "Maple bus at (%d, %d): Connected function 0x%lX\n",
dev->port, dev->unit, function); dev->port, dev->unit, function);
matched = matched =
bus_for_each_drv(&maple_bus_type, NULL, dev, bus_for_each_drv(&maple_bus_type, NULL, dev,
attach_matching_maple_driver); attach_matching_maple_driver);
if (matched == 0) { if (matched == 0) {
/* Driver does not exist yet */ /* Driver does not exist yet */
printk(KERN_INFO printk(KERN_INFO
"No maple driver found for this device\n"); "No maple driver found for this device\n");
dev->driver = &maple_dummy_driver; dev->driver = &maple_dummy_driver;
} }
sprintf(dev->dev.bus_id, "%d:0%d.%lX", dev->port, sprintf(dev->dev.bus_id, "%d:0%d.%lX", dev->port,
dev->unit, function); dev->unit, function);
} }
dev->function = function; dev->function = function;
dev->dev.bus = &maple_bus_type; dev->dev.bus = &maple_bus_type;
dev->dev.parent = &maple_bus; dev->dev.parent = &maple_bus;
dev->dev.release = &maple_release_device; dev->dev.release = &maple_release_device;
retval = device_register(&dev->dev); retval = device_register(&dev->dev);
if (retval) { if (retval) {
printk(KERN_INFO printk(KERN_INFO
"Maple bus: Attempt to register device (%x, %x) failed.\n", "Maple bus: Attempt to register device (%x, %x) failed.\n",
dev->port, dev->unit); dev->port, dev->unit);
maple_free_dev(dev); maple_free_dev(dev);
} }
dev->registered = 1; dev->registered = 1;
} }
/* /*
...@@ -340,270 +343,271 @@ static void maple_attach_driver(struct maple_device *dev) ...@@ -340,270 +343,271 @@ static void maple_attach_driver(struct maple_device *dev)
*/ */
static int detach_maple_device(struct device *device, void *portptr) static int detach_maple_device(struct device *device, void *portptr)
{ {
struct maple_device_specify *ds; struct maple_device_specify *ds;
struct maple_device *mdev; struct maple_device *mdev;
ds = portptr; ds = portptr;
mdev = to_maple_dev(device); mdev = to_maple_dev(device);
if (mdev->port == ds->port && mdev->unit == ds->unit) if (mdev->port == ds->port && mdev->unit == ds->unit)
return 1; return 1;
return 0; return 0;
} }
static int setup_maple_commands(struct device *device, void *ignored) static int setup_maple_commands(struct device *device, void *ignored)
{ {
struct maple_device *maple_dev = to_maple_dev(device); struct maple_device *maple_dev = to_maple_dev(device);
if ((maple_dev->interval > 0) if ((maple_dev->interval > 0)
&& time_after(jiffies, maple_dev->when)) { && time_after(jiffies, maple_dev->when)) {
maple_dev->when = jiffies + maple_dev->interval; maple_dev->when = jiffies + maple_dev->interval;
maple_dev->mq->command = MAPLE_COMMAND_GETCOND; maple_dev->mq->command = MAPLE_COMMAND_GETCOND;
maple_dev->mq->sendbuf = &maple_dev->function; maple_dev->mq->sendbuf = &maple_dev->function;
maple_dev->mq->length = 1; maple_dev->mq->length = 1;
maple_add_packet(maple_dev->mq); maple_add_packet(maple_dev->mq);
liststatus++; liststatus++;
} else { } else {
if (time_after(jiffies, maple_pnp_time)) { if (time_after(jiffies, maple_pnp_time)) {
maple_dev->mq->command = MAPLE_COMMAND_DEVINFO; maple_dev->mq->command = MAPLE_COMMAND_DEVINFO;
maple_dev->mq->length = 0; maple_dev->mq->length = 0;
maple_add_packet(maple_dev->mq); maple_add_packet(maple_dev->mq);
liststatus++; liststatus++;
} }
} }
return 0; return 0;
} }
/* VBLANK bottom half - implemented via workqueue */ /* VBLANK bottom half - implemented via workqueue */
static void maple_vblank_handler(struct work_struct *work) static void maple_vblank_handler(struct work_struct *work)
{ {
if (!maple_dma_done()) if (!maple_dma_done())
return; return;
if (!list_empty(&maple_sentq)) if (!list_empty(&maple_sentq))
return; return;
ctrl_outl(0, MAPLE_ENABLE); ctrl_outl(0, MAPLE_ENABLE);
liststatus = 0; liststatus = 0;
bus_for_each_dev(&maple_bus_type, NULL, NULL, bus_for_each_dev(&maple_bus_type, NULL, NULL,
setup_maple_commands); setup_maple_commands);
if (time_after(jiffies, maple_pnp_time)) if (time_after(jiffies, maple_pnp_time))
maple_pnp_time = jiffies + MAPLE_PNP_INTERVAL; maple_pnp_time = jiffies + MAPLE_PNP_INTERVAL;
if (liststatus && list_empty(&maple_sentq)) { if (liststatus && list_empty(&maple_sentq)) {
INIT_LIST_HEAD(&maple_sentq); INIT_LIST_HEAD(&maple_sentq);
maple_send(); maple_send();
} }
maplebus_dma_reset(); maplebus_dma_reset();
} }
/* handle devices added via hotplugs - placing them on queue for DEVINFO*/ /* handle devices added via hotplugs - placing them on queue for DEVINFO*/
static void maple_map_subunits(struct maple_device *mdev, int submask) static void maple_map_subunits(struct maple_device *mdev, int submask)
{ {
int retval, k, devcheck; int retval, k, devcheck;
struct maple_device *mdev_add; struct maple_device *mdev_add;
struct maple_device_specify ds; struct maple_device_specify ds;
for (k = 0; k < 5; k++) { for (k = 0; k < 5; k++) {
ds.port = mdev->port; ds.port = mdev->port;
ds.unit = k + 1; ds.unit = k + 1;
retval = retval =
bus_for_each_dev(&maple_bus_type, NULL, &ds, bus_for_each_dev(&maple_bus_type, NULL, &ds,
detach_maple_device); detach_maple_device);
if (retval) { if (retval) {
submask = submask >> 1; submask = submask >> 1;
continue; continue;
} }
devcheck = submask & 0x01; devcheck = submask & 0x01;
if (devcheck) { if (devcheck) {
mdev_add = maple_alloc_dev(mdev->port, k + 1); mdev_add = maple_alloc_dev(mdev->port, k + 1);
if (!mdev_add) if (!mdev_add)
return; return;
mdev_add->mq->command = MAPLE_COMMAND_DEVINFO; mdev_add->mq->command = MAPLE_COMMAND_DEVINFO;
mdev_add->mq->length = 0; mdev_add->mq->length = 0;
maple_add_packet(mdev_add->mq); maple_add_packet(mdev_add->mq);
scanning = 1; scanning = 1;
} }
submask = submask >> 1; submask = submask >> 1;
} }
} }
/* mark a device as removed */ /* mark a device as removed */
static void maple_clean_submap(struct maple_device *mdev) static void maple_clean_submap(struct maple_device *mdev)
{ {
int killbit; int killbit;
killbit = (mdev->unit > 0 ? (1 << (mdev->unit - 1)) & 0x1f : 0x20); killbit = (mdev->unit > 0 ? (1 << (mdev->unit - 1)) & 0x1f : 0x20);
killbit = ~killbit; killbit = ~killbit;
killbit &= 0xFF; killbit &= 0xFF;
subdevice_map[mdev->port] = subdevice_map[mdev->port] & killbit; subdevice_map[mdev->port] = subdevice_map[mdev->port] & killbit;
} }
/* handle empty port or hotplug removal */ /* handle empty port or hotplug removal */
static void maple_response_none(struct maple_device *mdev, static void maple_response_none(struct maple_device *mdev,
struct mapleq *mq) struct mapleq *mq)
{ {
if (mdev->unit != 0) { if (mdev->unit != 0) {
list_del(&mq->list); list_del(&mq->list);
maple_clean_submap(mdev); maple_clean_submap(mdev);
printk(KERN_INFO printk(KERN_INFO
"Maple bus device detaching at (%d, %d)\n", "Maple bus device detaching at (%d, %d)\n",
mdev->port, mdev->unit); mdev->port, mdev->unit);
maple_detach_driver(mdev); maple_detach_driver(mdev);
return; return;
} }
if (!started) { if (!started) {
printk(KERN_INFO "No maple devices attached to port %d\n", printk(KERN_INFO "No maple devices attached to port %d\n",
mdev->port); mdev->port);
return; return;
} }
maple_clean_submap(mdev); maple_clean_submap(mdev);
} }
/* preprocess hotplugs or scans */ /* preprocess hotplugs or scans */
static void maple_response_devinfo(struct maple_device *mdev, static void maple_response_devinfo(struct maple_device *mdev,
char *recvbuf) char *recvbuf)
{ {
char submask; char submask;
if ((!started) || (scanning == 2)) { if ((!started) || (scanning == 2)) {
maple_attach_driver(mdev); maple_attach_driver(mdev);
return; return;
} }
if (mdev->unit == 0) { if (mdev->unit == 0) {
submask = recvbuf[2] & 0x1F; submask = recvbuf[2] & 0x1F;
if (submask ^ subdevice_map[mdev->port]) { if (submask ^ subdevice_map[mdev->port]) {
maple_map_subunits(mdev, submask); maple_map_subunits(mdev, submask);
subdevice_map[mdev->port] = submask; subdevice_map[mdev->port] = submask;
} }
} }
} }
/* maple dma end bottom half - implemented via workqueue */ /* maple dma end bottom half - implemented via workqueue */
static void maple_dma_handler(struct work_struct *work) static void maple_dma_handler(struct work_struct *work)
{ {
struct mapleq *mq, *nmq; struct mapleq *mq, *nmq;
struct maple_device *dev; struct maple_device *dev;
char *recvbuf; char *recvbuf;
enum maple_code code; enum maple_code code;
if (!maple_dma_done()) if (!maple_dma_done())
return; return;
ctrl_outl(0, MAPLE_ENABLE); ctrl_outl(0, MAPLE_ENABLE);
if (!list_empty(&maple_sentq)) { if (!list_empty(&maple_sentq)) {
list_for_each_entry_safe(mq, nmq, &maple_sentq, list) { list_for_each_entry_safe(mq, nmq, &maple_sentq, list) {
recvbuf = mq->recvbuf; recvbuf = mq->recvbuf;
code = recvbuf[0]; code = recvbuf[0];
dev = mq->dev; dev = mq->dev;
switch (code) { switch (code) {
case MAPLE_RESPONSE_NONE: case MAPLE_RESPONSE_NONE:
maple_response_none(dev, mq); maple_response_none(dev, mq);
break; break;
case MAPLE_RESPONSE_DEVINFO: case MAPLE_RESPONSE_DEVINFO:
maple_response_devinfo(dev, recvbuf); maple_response_devinfo(dev, recvbuf);
break; break;
case MAPLE_RESPONSE_DATATRF: case MAPLE_RESPONSE_DATATRF:
if (dev->callback) if (dev->callback)
dev->callback(mq); dev->callback(mq);
break; break;
case MAPLE_RESPONSE_FILEERR: case MAPLE_RESPONSE_FILEERR:
case MAPLE_RESPONSE_AGAIN: case MAPLE_RESPONSE_AGAIN:
case MAPLE_RESPONSE_BADCMD: case MAPLE_RESPONSE_BADCMD:
case MAPLE_RESPONSE_BADFUNC: case MAPLE_RESPONSE_BADFUNC:
printk(KERN_DEBUG printk(KERN_DEBUG
"Maple non-fatal error 0x%X\n", "Maple non-fatal error 0x%X\n",
code); code);
break; break;
case MAPLE_RESPONSE_ALLINFO: case MAPLE_RESPONSE_ALLINFO:
printk(KERN_DEBUG printk(KERN_DEBUG
"Maple - extended device information not supported\n"); "Maple - extended device information not supported\n");
break; break;
case MAPLE_RESPONSE_OK: case MAPLE_RESPONSE_OK:
break; break;
default: default:
break; break;
} }
} }
INIT_LIST_HEAD(&maple_sentq); INIT_LIST_HEAD(&maple_sentq);
if (scanning == 1) { if (scanning == 1) {
maple_send(); maple_send();
scanning = 2; scanning = 2;
} else } else
scanning = 0; scanning = 0;
if (started == 0) if (started == 0)
started = 1; started = 1;
} }
maplebus_dma_reset(); maplebus_dma_reset();
} }
static irqreturn_t maplebus_dma_interrupt(int irq, void *dev_id) static irqreturn_t maplebus_dma_interrupt(int irq, void *dev_id)
{ {
/* Load everything into the bottom half */ /* Load everything into the bottom half */
schedule_work(&maple_dma_process); schedule_work(&maple_dma_process);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static irqreturn_t maplebus_vblank_interrupt(int irq, void *dev_id) static irqreturn_t maplebus_vblank_interrupt(int irq, void *dev_id)
{ {
schedule_work(&maple_vblank_process); schedule_work(&maple_vblank_process);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static struct irqaction maple_dma_irq = { static struct irqaction maple_dma_irq = {
.name = "maple bus DMA handler", .name = "maple bus DMA handler",
.handler = maplebus_dma_interrupt, .handler = maplebus_dma_interrupt,
.flags = IRQF_SHARED, .flags = IRQF_SHARED,
}; };
static struct irqaction maple_vblank_irq = { static struct irqaction maple_vblank_irq = {
.name = "maple bus VBLANK handler", .name = "maple bus VBLANK handler",
.handler = maplebus_vblank_interrupt, .handler = maplebus_vblank_interrupt,
.flags = IRQF_SHARED, .flags = IRQF_SHARED,
}; };
static int maple_set_dma_interrupt_handler(void) static int maple_set_dma_interrupt_handler(void)
{ {
return setup_irq(HW_EVENT_MAPLE_DMA, &maple_dma_irq); return setup_irq(HW_EVENT_MAPLE_DMA, &maple_dma_irq);
} }
static int maple_set_vblank_interrupt_handler(void) static int maple_set_vblank_interrupt_handler(void)
{ {
return setup_irq(HW_EVENT_VSYNC, &maple_vblank_irq); return setup_irq(HW_EVENT_VSYNC, &maple_vblank_irq);
} }
static int maple_get_dma_buffer(void) static int maple_get_dma_buffer(void)
{ {
maple_sendbuf = maple_sendbuf =
(void *) __get_free_pages(GFP_KERNEL | __GFP_ZERO, (void *) __get_free_pages(GFP_KERNEL | __GFP_ZERO,
MAPLE_DMA_PAGES); MAPLE_DMA_PAGES);
if (!maple_sendbuf) if (!maple_sendbuf)
return -ENOMEM; return -ENOMEM;
return 0; return 0;
} }
static int match_maple_bus_driver(struct device *devptr, static int match_maple_bus_driver(struct device *devptr,
struct device_driver *drvptr) struct device_driver *drvptr)
{ {
struct maple_driver *maple_drv; struct maple_driver *maple_drv;
struct maple_device *maple_dev; struct maple_device *maple_dev;
maple_drv = container_of(drvptr, struct maple_driver, drv); maple_drv = container_of(drvptr, struct maple_driver, drv);
maple_dev = container_of(devptr, struct maple_device, dev); maple_dev = container_of(devptr, struct maple_device, dev);
/* Trap empty port case */ /* Trap empty port case */
if (maple_dev->devinfo.function == 0xFFFFFFFF) if (maple_dev->devinfo.function == 0xFFFFFFFF)
return 0; return 0;
else if (maple_dev->devinfo.function & else if (maple_dev->devinfo.function &
be32_to_cpu(maple_drv->function)) be32_to_cpu(maple_drv->function))
return 1; return 1;
return 0; return 0;
} }
static int maple_bus_uevent(struct device *dev, struct kobj_uevent_env *env) static int maple_bus_uevent(struct device *dev,
struct kobj_uevent_env *env)
{ {
return 0; return 0;
} }
static void maple_bus_release(struct device *dev) static void maple_bus_release(struct device *dev)
...@@ -611,124 +615,126 @@ static void maple_bus_release(struct device *dev) ...@@ -611,124 +615,126 @@ static void maple_bus_release(struct device *dev)
} }
static struct maple_driver maple_dummy_driver = { static struct maple_driver maple_dummy_driver = {
.drv = { .drv = {
.name = "maple_dummy_driver", .name = "maple_dummy_driver",
.bus = &maple_bus_type, .bus = &maple_bus_type,
}, },
}; };
struct bus_type maple_bus_type = { struct bus_type maple_bus_type = {
.name = "maple", .name = "maple",
.match = match_maple_bus_driver, .match = match_maple_bus_driver,
.uevent = maple_bus_uevent, .uevent = maple_bus_uevent,
}; };
EXPORT_SYMBOL_GPL(maple_bus_type); EXPORT_SYMBOL_GPL(maple_bus_type);
static struct device maple_bus = { static struct device maple_bus = {
.bus_id = "maple", .bus_id = "maple",
.release = maple_bus_release, .release = maple_bus_release,
}; };
static int __init maple_bus_init(void) static int __init maple_bus_init(void)
{ {
int retval, i; int retval, i;
struct maple_device *mdev[MAPLE_PORTS]; struct maple_device *mdev[MAPLE_PORTS];
ctrl_outl(0, MAPLE_STATE); ctrl_outl(0, MAPLE_STATE);
retval = device_register(&maple_bus); retval = device_register(&maple_bus);
if (retval) if (retval)
goto cleanup; goto cleanup;
retval = bus_register(&maple_bus_type); retval = bus_register(&maple_bus_type);
if (retval) if (retval)
goto cleanup_device; goto cleanup_device;
retval = driver_register(&maple_dummy_driver.drv); retval = driver_register(&maple_dummy_driver.drv);
if (retval) if (retval)
goto cleanup_bus; goto cleanup_bus;
/* allocate memory for maple bus dma */ /* allocate memory for maple bus dma */
retval = maple_get_dma_buffer(); retval = maple_get_dma_buffer();
if (retval) { if (retval) {
printk(KERN_INFO printk(KERN_INFO
"Maple bus: Failed to allocate Maple DMA buffers\n"); "Maple bus: Failed to allocate Maple DMA buffers\n");
goto cleanup_basic; goto cleanup_basic;
} }
/* set up DMA interrupt handler */ /* set up DMA interrupt handler */
retval = maple_set_dma_interrupt_handler(); retval = maple_set_dma_interrupt_handler();
if (retval) { if (retval) {
printk(KERN_INFO printk(KERN_INFO
"Maple bus: Failed to grab maple DMA IRQ\n"); "Maple bus: Failed to grab maple DMA IRQ\n");
goto cleanup_dma; goto cleanup_dma;
} }
/* set up VBLANK interrupt handler */ /* set up VBLANK interrupt handler */
retval = maple_set_vblank_interrupt_handler(); retval = maple_set_vblank_interrupt_handler();
if (retval) { if (retval) {
printk(KERN_INFO "Maple bus: Failed to grab VBLANK IRQ\n"); printk(KERN_INFO "Maple bus: Failed to grab VBLANK IRQ\n");
goto cleanup_irq; goto cleanup_irq;
} }
maple_queue_cache = maple_queue_cache =
kmem_cache_create("maple_queue_cache", 0x400, 0, kmem_cache_create("maple_queue_cache", 0x400, 0,
SLAB_HWCACHE_ALIGN, NULL); SLAB_HWCACHE_ALIGN, NULL);
if (!maple_queue_cache) if (!maple_queue_cache)
goto cleanup_bothirqs; goto cleanup_bothirqs;
/* setup maple ports */ /* setup maple ports */
for (i = 0; i < MAPLE_PORTS; i++) { for (i = 0; i < MAPLE_PORTS; i++) {
mdev[i] = maple_alloc_dev(i, 0); mdev[i] = maple_alloc_dev(i, 0);
if (!mdev[i]) { if (!mdev[i]) {
while (i-- > 0) while (i-- > 0)
maple_free_dev(mdev[i]); maple_free_dev(mdev[i]);
goto cleanup_cache; goto cleanup_cache;
} }
mdev[i]->registered = 0; mdev[i]->registered = 0;
mdev[i]->mq->command = MAPLE_COMMAND_DEVINFO; mdev[i]->mq->command = MAPLE_COMMAND_DEVINFO;
mdev[i]->mq->length = 0; mdev[i]->mq->length = 0;
maple_attach_driver(mdev[i]); maple_attach_driver(mdev[i]);
maple_add_packet(mdev[i]->mq); maple_add_packet(mdev[i]->mq);
subdevice_map[i] = 0; subdevice_map[i] = 0;
} }
/* setup maplebus hardware */ /* setup maplebus hardware */
maplebus_dma_reset(); maplebus_dma_reset();
/* initial detection */ /* initial detection */
maple_send(); maple_send();
maple_pnp_time = jiffies; maple_pnp_time = jiffies;
printk(KERN_INFO "Maple bus core now registered.\n"); printk(KERN_INFO "Maple bus core now registered.\n");
return 0; return 0;
cleanup_cache: cleanup_cache:
kmem_cache_destroy(maple_queue_cache); kmem_cache_destroy(maple_queue_cache);
cleanup_bothirqs: cleanup_bothirqs:
free_irq(HW_EVENT_VSYNC, 0); free_irq(HW_EVENT_VSYNC, 0);
cleanup_irq: cleanup_irq:
free_irq(HW_EVENT_MAPLE_DMA, 0); free_irq(HW_EVENT_MAPLE_DMA, 0);
cleanup_dma: cleanup_dma:
free_pages((unsigned long) maple_sendbuf, MAPLE_DMA_PAGES); free_pages((unsigned long) maple_sendbuf, MAPLE_DMA_PAGES);
cleanup_basic: cleanup_basic:
driver_unregister(&maple_dummy_driver.drv); driver_unregister(&maple_dummy_driver.drv);
cleanup_bus: cleanup_bus:
bus_unregister(&maple_bus_type); bus_unregister(&maple_bus_type);
cleanup_device: cleanup_device:
device_unregister(&maple_bus); device_unregister(&maple_bus);
cleanup: cleanup:
printk(KERN_INFO "Maple bus registration failed\n"); printk(KERN_INFO "Maple bus registration failed\n");
return retval; return retval;
} }
subsys_initcall(maple_bus_init); subsys_initcall(maple_bus_init);
...@@ -7,74 +7,75 @@ extern struct bus_type maple_bus_type; ...@@ -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 */
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册