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.3
[linux-2.6.git]
/
drivers
/
pcmcia
/
tcic.c
diff --git
a/drivers/pcmcia/tcic.c
b/drivers/pcmcia/tcic.c
index
5f9b4be
..
d986d13
100644
(file)
--- a/
drivers/pcmcia/tcic.c
+++ b/
drivers/pcmcia/tcic.c
@@
-60,7
+60,7
@@
static int pc_debug;
module_param(pc_debug, int, 0644);
static int pc_debug;
module_param(pc_debug, int, 0644);
-static const char
*version
=
+static const char
version[]
=
"tcic.c 1.111 2000/02/15 04:13:12 (David Hinds)";
#define debug(lvl, fmt, arg...) do { \
"tcic.c 1.111 2000/02/15 04:13:12 (David Hinds)";
#define debug(lvl, fmt, arg...) do { \
@@
-829,15
+829,15
@@
static int tcic_set_mem_map(struct pcmcia_socket *sock, struct pccard_mem_map *m
debug(1, "SetMemMap(%d, %d, %#2.2x, %d ns, "
"%#5.5lx-%#5.5lx, %#5.5x)\n", psock, mem->map, mem->flags,
debug(1, "SetMemMap(%d, %d, %#2.2x, %d ns, "
"%#5.5lx-%#5.5lx, %#5.5x)\n", psock, mem->map, mem->flags,
- mem->speed, mem->
sys_start, mem->sys_stop
, mem->card_start);
+ mem->speed, mem->
res->start, mem->res->end
, mem->card_start);
if ((mem->map > 3) || (mem->card_start > 0x3ffffff) ||
if ((mem->map > 3) || (mem->card_start > 0x3ffffff) ||
- (mem->
sys_start > 0xffffff) || (mem->sys_stop
> 0xffffff) ||
- (mem->
sys_start > mem->sys_stop
) || (mem->speed > 1000))
+ (mem->
res->start > 0xffffff) || (mem->res->end
> 0xffffff) ||
+ (mem->
res->start > mem->res->end
) || (mem->speed > 1000))
return -EINVAL;
tcic_setw(TCIC_ADDR+2, TCIC_ADR2_INDREG | (psock << TCIC_SS_SHFT));
addr = TCIC_MWIN(psock, mem->map);
return -EINVAL;
tcic_setw(TCIC_ADDR+2, TCIC_ADR2_INDREG | (psock << TCIC_SS_SHFT));
addr = TCIC_MWIN(psock, mem->map);
- base = mem->
sys_start; len = mem->sys_stop - mem->sys_
start;
+ base = mem->
res->start; len = mem->res->end - mem->res->
start;
if ((len & (len+1)) || (base & len)) return -EINVAL;
if (len == 0x0fff)
base = (base >> TCIC_MBASE_HA_SHFT) | TCIC_MBASE_4K_BIT;
if ((len & (len+1)) || (base & len)) return -EINVAL;
if (len == 0x0fff)
base = (base >> TCIC_MBASE_HA_SHFT) | TCIC_MBASE_4K_BIT;
@@
-846,7
+846,7
@@
static int tcic_set_mem_map(struct pcmcia_socket *sock, struct pccard_mem_map *m
tcic_setw(TCIC_ADDR, addr + TCIC_MBASE_X);
tcic_setw(TCIC_DATA, base);
tcic_setw(TCIC_ADDR, addr + TCIC_MBASE_X);
tcic_setw(TCIC_DATA, base);
- mmap = mem->card_start - mem->
sys_
start;
+ mmap = mem->card_start - mem->
res->
start;
mmap = (mmap >> TCIC_MMAP_CA_SHFT) & TCIC_MMAP_CA_MASK;
if (mem->flags & MAP_ATTRIB) mmap |= TCIC_MMAP_REG;
tcic_setw(TCIC_ADDR, addr + TCIC_MMAP_X);
mmap = (mmap >> TCIC_MMAP_CA_SHFT) & TCIC_MMAP_CA_MASK;
if (mem->flags & MAP_ATTRIB) mmap |= TCIC_MMAP_REG;
tcic_setw(TCIC_ADDR, addr + TCIC_MMAP_X);
@@
-868,10
+868,10
@@
static int tcic_set_mem_map(struct pcmcia_socket *sock, struct pccard_mem_map *m
static int tcic_init(struct pcmcia_socket *s)
{
int i;
static int tcic_init(struct pcmcia_socket *s)
{
int i;
+ struct resource res = { .start = 0, .end = 0x1000 };
pccard_io_map io = { 0, 0, 0, 0, 1 };
pccard_io_map io = { 0, 0, 0, 0, 1 };
- pccard_mem_map mem = {
0, 0, 0, 0, 0, 0
};
+ pccard_mem_map mem = {
.res = &res,
};
- mem.sys_stop = 0x1000;
for (i = 0; i < 2; i++) {
io.map = i;
tcic_set_io_map(s, &io);
for (i = 0; i < 2; i++) {
io.map = i;
tcic_set_io_map(s, &io);