d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFP4: Minor tweaks.

Browse Source
This commit is contained in:
Warner Losh 2005-10-14 04:48:11 +00:00
parent 2ae7662803
commit 1d508c2092
1 changed files with 5 additions and 1 deletions

6
sys/dev/exca/exca.c

@ -181,6 +181,8 @@ exca_do_mem_map(struct exca_softc *sc, int win)
struct mem_map_index_st *map; struct mem_map_index_st *map;
struct pccard_mem_handle *mem; struct pccard_mem_handle *mem;
uint32_t offset; uint32_t offset;
int mem8 = (mem->kind == PCCARD_A_MEM_ATTR);
mem8 = 1;
map = &mem_map_index[win]; map = &mem_map_index[win];
mem = &sc->mem[win]; mem = &sc->mem[win];
@ -190,7 +192,8 @@ exca_do_mem_map(struct exca_softc *sc, int win)
(mem->addr >> EXCA_SYSMEM_ADDRX_SHIFT) & 0xff); (mem->addr >> EXCA_SYSMEM_ADDRX_SHIFT) & 0xff);
exca_putb(sc, map->sysmem_start_msb, exca_putb(sc, map->sysmem_start_msb,
((mem->addr >> (EXCA_SYSMEM_ADDRX_SHIFT + 8)) & ((mem->addr >> (EXCA_SYSMEM_ADDRX_SHIFT + 8)) &
EXCA_SYSMEM_ADDRX_START_MSB_ADDR_MASK)); EXCA_SYSMEM_ADDRX_START_MSB_ADDR_MASK) |
(mem8 ? 0 : EXCA_SYSMEM_ADDRX_START_MSB_DATASIZE_16BIT));
exca_putb(sc, map->sysmem_stop_lsb, exca_putb(sc, map->sysmem_stop_lsb,
((mem->addr + mem->realsize - 1) >> ((mem->addr + mem->realsize - 1) >>
@ -643,6 +646,7 @@ exca_valid_slot(struct exca_softc *exca)
* IBM clone chips use 0x88 and 0x89, apparently * IBM clone chips use 0x88 and 0x89, apparently
*/ */
c = exca_getb(exca, EXCA_IDENT); c = exca_getb(exca, EXCA_IDENT);
DEVPRINTF(exca->dev, "Ident is %x\n", c);
if ((c & EXCA_IDENT_IFTYPE_MASK) != EXCA_IDENT_IFTYPE_MEM_AND_IO) if ((c & EXCA_IDENT_IFTYPE_MASK) != EXCA_IDENT_IFTYPE_MEM_AND_IO)
return (0); return (0);
if ((c & EXCA_IDENT_ZERO) != 0) if ((c & EXCA_IDENT_ZERO) != 0)