From a782659494f6a2a8469525f71c925acffda74098 Mon Sep 17 00:00:00 2001 From: imp Date: Sun, 6 Feb 2005 21:03:13 +0000 Subject: Move resource allocation routines from cardbus_cis.c to cardbus.c. They have nothing at all to do with CIS parsing. Remove some unused funce parsing: nothing used the results. Use more of pccard_cis.h's deifnitions for the cardbus specific cis parsing we do. More work is needed in this area. This reduces the size of the cardbus module by 380 bytes or so... --- sys/dev/cardbus/cardbus_cis.h | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) (limited to 'sys/dev/cardbus/cardbus_cis.h') diff --git a/sys/dev/cardbus/cardbus_cis.h b/sys/dev/cardbus/cardbus_cis.h index 93c81e6..086e4ea 100644 --- a/sys/dev/cardbus/cardbus_cis.h +++ b/sys/dev/cardbus/cardbus_cis.h @@ -29,11 +29,10 @@ /* * Cardbus CIS definitions */ +int cardbus_do_cis(device_t, device_t); struct cis_tupleinfo; -int cardbus_do_cis(device_t, device_t); - #define MAXTUPLESIZE 0x400 /* BAR */ @@ -43,23 +42,3 @@ int cardbus_do_cis(device_t, device_t); #define TPL_BAR_REG_PREFETCHABLE_CACHEABLE 0x40 #define TPL_BAR_REG_PREFETCHABLE 0x60 #define TPL_BAR_REG_BELOW1MB 0x80 - -/* CISTPL_FUNC */ -#define TPL_FUNC_MF 0 /* multi function tuple */ -#define TPL_FUNC_MEM 1 /* memory */ -#define TPL_FUNC_SERIAL 2 /* serial, including modem and fax */ -#define TPL_FUNC_PARALLEL 3 /* parallel, including printer and SCSI */ -#define TPL_FUNC_DISK 4 /* Disk */ -#define TPL_FUNC_VIDEO 5 /* Video Adaptor */ -#define TPL_FUNC_LAN 6 /* LAN Adaptor */ -#define TPL_FUNC_AIMS 7 /* Auto Inclement Mass Strages */ - -/* TPL_FUNC_LAN */ -#define TPL_FUNCE_LAN_TECH 1 /* technology */ -#define TPL_FUNCE_LAN_SPEED 2 /* speed */ -#define TPL_FUNCE_LAN_MEDIA 3 /* which media do you use? */ -#define TPL_FUNCE_LAN_NID 4 /* node id (address) */ -#define TPL_FUNCE_LAN_CONN 5 /* connector type (shape) */ - -/* TPL_FUNC_SERIAL */ -#define TPL_FUNCE_SER_UART 0 /* UART type */ -- cgit v1.1