From 13a243d8b505e941ea630f4b61891daf50fefeea Mon Sep 17 00:00:00 2001 From: imp Date: Thu, 20 Apr 2000 08:37:46 +0000 Subject: o Preliminary support for mapping the CIS by the driver. o Modify xe driver to use this. There's still some issues with this code, so xe can't map the cis just yet. I'm thinking about how to resolve the issue. pccard_nbk's pccard_alloc_resource is getting in the way. --- sys/dev/xe/if_xe.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'sys/dev') diff --git a/sys/dev/xe/if_xe.c b/sys/dev/xe/if_xe.c index 00d75c6..8ed6196 100644 --- a/sys/dev/xe/if_xe.c +++ b/sys/dev/xe/if_xe.c @@ -35,9 +35,6 @@ * * xe_memwrite -- maybe better handled pccard layer? * xe_cem56fix -- need to figure out how to map the extra stuff. - * xe_activate -- need to write it, and add some stuff to it. Look at if_sn - * for guidance. resources/interrupts. - * xe_deactivate -- turn off resources/interrupts. */ /* @@ -142,6 +139,9 @@ #include #include +#include +#include "card_if.h" + #include #include @@ -331,7 +331,6 @@ xe_probe(device_t dev) #endif /* Map in the CIS */ - /* XXX This CANNOT work as it needs RF_PCCARD_ATTR support */ r = bus_alloc_resource(dev, SYS_RES_MEMORY, &rid, 0, ~0, 4 << 10, RF_ACTIVE); if (!r) { #ifdef XE_DEBUG @@ -341,6 +340,9 @@ xe_probe(device_t dev) } buf = (u_char *) rman_get_start(r); + CARD_SET_RES_FLAGS(device_get_parent(dev), dev, SYS_RES_MEMORY, rid, + PCCARD_A_MEM_ATTR); + /* Grep through CIS looking for relevant tuples */ offs = 0; do { -- cgit v1.1