res->name = name;
res->start = b;
res->end = b + n - 1;
- res->flags = flags;
+ res->flags = flags | IORESOURCE_BUSY;
}
return res;
}
s->cis_mem.sys_start = res->start;
s->cis_mem.sys_stop = res->end;
- s->cis_mem.res = res;
s->cis_virt = ioremap(res->start, s->map_size);
if (s->cis_virt) {
ret = pcmcia_validate_cis(s->clients, info);
}
s->cis_mem.sys_start = 0;
s->cis_mem.sys_stop = 0;
- s->cis_mem.res = NULL;
if ((ret != 0) || (info->Chains == 0))
return 0;
return 1;
map.speed = 0;
map.sys_start = res->start;
map.sys_stop = res->end;
- map.res = res;
map.card_start = 0;
s->ops->set_mem_map(s, &map);
return do_mem_probe(m->base, m->num, s);
}
-static void validate_mem(struct pcmcia_socket *s)
+void validate_mem(struct pcmcia_socket *s)
{
resource_map_t *m, mm;
static u_char order[] = { 0xd0, 0xe0, 0xc0, 0xf0 };
u_long b, i, ok = 0;
int force_low = !(s->features & SS_CAP_PAGE_REGS);
+ if (!probe_mem)
+ return;
+
down(&rsrc_sem);
/* We do up to four passes through the list */
if (!force_low) {
#else /* CONFIG_PCMCIA_PROBE */
-static void validate_mem(struct pcmcia_socket *s)
+void validate_mem(struct pcmcia_socket *s)
{
resource_map_t *m, mm;
static int done = 0;
- if (done++ == 0) {
+ if (probe_mem && done++ == 0) {
down(&rsrc_sem);
for (m = mem_db.next; m != &mem_db; m = mm.next) {
mm = *m;
#endif /* CONFIG_PCMCIA_PROBE */
-void pcmcia_validate_mem(struct pcmcia_socket *s)
-{
- down(&s->skt_sem);
-
- if (probe_mem && s->state & SOCKET_PRESENT)
- validate_mem(s);
-
- up(&s->skt_sem);
-}
-
-EXPORT_SYMBOL(pcmcia_validate_mem);
-
struct pcmcia_align_data {
unsigned long mask;
unsigned long offset;
struct resource *find_io_region(unsigned long base, int num,
unsigned long align, char *name, struct pcmcia_socket *s)
{
- struct resource *res = make_resource(0, num, IORESOURCE_IO, s->dev.class_id);
+ struct resource *res = make_resource(0, num, IORESOURCE_IO, name);
struct pcmcia_align_data data;
unsigned long min = base;
int ret;
min, 0, pcmcia_align, &data);
} else
#endif
- ret = allocate_resource(&ioport_resource, res, num, min, ~0UL,
- 1, pcmcia_align, &data);
+ ret = allocate_resource(&ioport_resource, res, num, min, ~0UL, 0,
+ pcmcia_align, &data);
up(&rsrc_sem);
if (ret != 0) {
return res;
}
-struct resource *find_mem_region(u_long base, u_long num, u_long align,
- int low, char *name, struct pcmcia_socket *s)
+int find_mem_region(u_long *base, u_long num, u_long align,
+ int low, char *name, struct pcmcia_socket *s)
{
- struct resource *res = make_resource(0, num, IORESOURCE_MEM, s->dev.class_id);
+ struct resource *res = make_resource(0, num, IORESOURCE_MEM, name);
struct pcmcia_align_data data;
unsigned long min, max;
int ret, i;
low = low || !(s->features & SS_CAP_PAGE_REGS);
data.mask = align - 1;
- data.offset = base & data.mask;
+ data.offset = *base & data.mask;
data.map = &mem_db;
for (i = 0; i < 2; i++) {
if (low) {
max = 0x100000UL;
- min = base < max ? base : 0;
+ min = *base < max ? *base : 0;
} else {
max = ~0UL;
- min = 0x100000UL + base;
+ min = 0x100000UL + *base;
}
down(&rsrc_sem);
} else
#endif
ret = allocate_resource(&iomem_resource, res, num, min,
- max, 1, pcmcia_align, &data);
+ max, 0, pcmcia_align, &data);
up(&rsrc_sem);
if (ret == 0 || low)
break;
if (ret != 0) {
kfree(res);
- res = NULL;
+ } else {
+ *base = res->start;
}
- return res;
+ return ret;
}
/*======================================================================