git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
pcmcia
/
tcic.c
diff --git
a/drivers/pcmcia/tcic.c
b/drivers/pcmcia/tcic.c
index
d986d13
..
52d2a38
100644
(file)
--- a/
drivers/pcmcia/tcic.c
+++ b/
drivers/pcmcia/tcic.c
@@
-45,9
+45,9
@@
#include <linux/delay.h>
#include <linux/workqueue.h>
#include <linux/device.h>
#include <linux/delay.h>
#include <linux/workqueue.h>
#include <linux/device.h>
+#include <linux/bitops.h>
#include <asm/io.h>
#include <asm/io.h>
-#include <asm/bitops.h>
#include <asm/system.h>
#include <pcmcia/version.h>
#include <asm/system.h>
#include <pcmcia/version.h>
@@
-80,7
+80,7
@@
MODULE_LICENSE("Dual MPL/GPL");
/* Parameters that can be set with 'insmod' */
/* The base port address of the TCIC-2 chip */
/* Parameters that can be set with 'insmod' */
/* The base port address of the TCIC-2 chip */
-static
int
tcic_base = TCIC_BASE;
+static
unsigned long
tcic_base = TCIC_BASE;
/* Specify a socket number to ignore */
static int ignore = -1;
/* Specify a socket number to ignore */
static int ignore = -1;
@@
-105,11
+105,11
@@
static int poll_quick = HZ/20;
/* CCLK external clock time, in nanoseconds. 70 ns = 14.31818 MHz */
static int cycle_time = 70;
/* CCLK external clock time, in nanoseconds. 70 ns = 14.31818 MHz */
static int cycle_time = 70;
-module_param(tcic_base,
int
, 0444);
+module_param(tcic_base,
ulong
, 0444);
module_param(ignore, int, 0444);
module_param(do_scan, int, 0444);
module_param(irq_mask, int, 0444);
module_param(ignore, int, 0444);
module_param(do_scan, int, 0444);
module_param(irq_mask, int, 0444);
-module_param_array(irq_list, int, irq_list_count, 0444);
+module_param_array(irq_list, int,
&
irq_list_count, 0444);
module_param(cs_irq, int, 0444);
module_param(poll_interval, int, 0444);
module_param(poll_quick, int, 0444);
module_param(cs_irq, int, 0444);
module_param(poll_interval, int, 0444);
module_param(poll_quick, int, 0444);
@@
-144,26
+144,26
@@
static struct tcic_socket socket_table[2];
static u_char tcic_getb(u_char reg)
{
u_char val = inb(tcic_base+reg);
static u_char tcic_getb(u_char reg)
{
u_char val = inb(tcic_base+reg);
- printk(KERN_DEBUG "tcic_getb(%#x) = %#x\n", tcic_base+reg, val);
+ printk(KERN_DEBUG "tcic_getb(%#
l
x) = %#x\n", tcic_base+reg, val);
return val;
}
static u_short tcic_getw(u_char reg)
{
u_short val = inw(tcic_base+reg);
return val;
}
static u_short tcic_getw(u_char reg)
{
u_short val = inw(tcic_base+reg);
- printk(KERN_DEBUG "tcic_getw(%#x) = %#x\n", tcic_base+reg, val);
+ printk(KERN_DEBUG "tcic_getw(%#
l
x) = %#x\n", tcic_base+reg, val);
return val;
}
static void tcic_setb(u_char reg, u_char data)
{
return val;
}
static void tcic_setb(u_char reg, u_char data)
{
- printk(KERN_DEBUG "tcic_setb(%#x, %#x)\n", tcic_base+reg, data);
+ printk(KERN_DEBUG "tcic_setb(%#
l
x, %#x)\n", tcic_base+reg, data);
outb(data, tcic_base+reg);
}
static void tcic_setw(u_char reg, u_short data)
{
outb(data, tcic_base+reg);
}
static void tcic_setw(u_char reg, u_short data)
{
- printk(KERN_DEBUG "tcic_setw(%#x, %#x)\n", tcic_base+reg, data);
+ printk(KERN_DEBUG "tcic_setw(%#
l
x, %#x)\n", tcic_base+reg, data);
outw(data, tcic_base+reg);
}
#else
outw(data, tcic_base+reg);
}
#else
@@
-344,10
+344,14
@@
static int __init is_active(int s)
if ((sstat & TCIC_SSTAT_CD) && (pwr & TCIC_PWR_VCC(s)) &&
(scf1 & TCIC_SCF1_IOSTS) && (ioctl & TCIC_ICTL_ENA) &&
if ((sstat & TCIC_SSTAT_CD) && (pwr & TCIC_PWR_VCC(s)) &&
(scf1 & TCIC_SCF1_IOSTS) && (ioctl & TCIC_ICTL_ENA) &&
- (check_region(base, num) != 0) && ((base & 0xfeef) != 0x02e8))
- return 1;
- else
- return 0;
+ ((base & 0xfeef) != 0x02e8)) {
+ struct resource *res = request_region(base, num, "tcic-2");
+ if (!res) /* region is busy */
+ return 1;
+ release_region(base, num);
+ }
+
+ return 0;
}
/*======================================================================
}
/*======================================================================
@@
-531,8
+535,9
@@
static int __init init_tcic(void)
for (i = 0; i < sockets; i++) {
socket_table[i].socket.ops = &tcic_operations;
for (i = 0; i < sockets; i++) {
socket_table[i].socket.ops = &tcic_operations;
+ socket_table[i].socket.resource_ops = &pccard_nonstatic_ops;
socket_table[i].socket.dev.dev = &tcic_device.dev;
socket_table[i].socket.dev.dev = &tcic_device.dev;
- ret = pcmcia_register_socket(&socket_table[i].socket);
+ ret = pcmcia_register_socket(&socket_table[i].socket);
if (ret && i)
pcmcia_unregister_socket(&socket_table[0].socket);
}
if (ret && i)
pcmcia_unregister_socket(&socket_table[0].socket);
}
@@
-791,7
+796,7
@@
static int tcic_set_io_map(struct pcmcia_socket *sock, struct pccard_io_map *io)
u_short base, len, ioctl;
debug(1, "SetIOMap(%d, %d, %#2.2x, %d ns, "
u_short base, len, ioctl;
debug(1, "SetIOMap(%d, %d, %#2.2x, %d ns, "
- "%#
4.4x-%#4.4
x)\n", psock, io->map, io->flags,
+ "%#
lx-%#l
x)\n", psock, io->map, io->flags,
io->speed, io->start, io->stop);
if ((io->map > 1) || (io->start > 0xffff) || (io->stop > 0xffff) ||
(io->stop < io->start)) return -EINVAL;
io->speed, io->start, io->stop);
if ((io->map > 1) || (io->start > 0xffff) || (io->stop > 0xffff) ||
(io->stop < io->start)) return -EINVAL;
@@
-828,7
+833,7
@@
static int tcic_set_mem_map(struct pcmcia_socket *sock, struct pccard_mem_map *m
u_long base, len, mmap;
debug(1, "SetMemMap(%d, %d, %#2.2x, %d ns, "
u_long base, len, mmap;
debug(1, "SetMemMap(%d, %d, %#2.2x, %d ns, "
- "%#
5.5lx-%#5.5lx, %#5.5
x)\n", psock, mem->map, mem->flags,
+ "%#
lx-%#lx, %#
x)\n", psock, mem->map, mem->flags,
mem->speed, mem->res->start, mem->res->end, mem->card_start);
if ((mem->map > 3) || (mem->card_start > 0x3ffffff) ||
(mem->res->start > 0xffffff) || (mem->res->end > 0xffffff) ||
mem->speed, mem->res->start, mem->res->end, mem->card_start);
if ((mem->map > 3) || (mem->card_start > 0x3ffffff) ||
(mem->res->start > 0xffffff) || (mem->res->end > 0xffffff) ||