From 331f033ddcae257485f7fcfb692e03071287a526 Mon Sep 17 00:00:00 2001 From: imp Date: Mon, 14 May 2001 05:56:12 +0000 Subject: [PATCH] Change machdep.pccard.pcic_mem_{start,end} to machdep.pccard.mem_{start,end} since they have nothing to do with pcic and it makes grepping for pcic infection in pccard harder. MFC after: 3 days --- sys/pccard/pccard_nbk.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/sys/pccard/pccard_nbk.c b/sys/pccard/pccard_nbk.c index 6155d86119a4..1e8e16f0c6e4 100644 --- a/sys/pccard/pccard_nbk.c +++ b/sys/pccard/pccard_nbk.c @@ -82,13 +82,13 @@ devclass_t pccard_devclass; SYSCTL_NODE(_machdep, OID_AUTO, pccard, CTLFLAG_RW, 0, "pccard"); -static u_long pcic_mem_start = IOM_BEGIN; -static u_long pcic_mem_end = IOM_END; +static u_long mem_start = IOM_BEGIN; +static u_long mem_end = IOM_END; -SYSCTL_ULONG(_machdep_pccard, OID_AUTO, pcic_mem_start, CTLFLAG_RW, - &pcic_mem_start, 0, ""); -SYSCTL_ULONG(_machdep_pccard, OID_AUTO, pcic_mem_end, CTLFLAG_RW, - &pcic_mem_end, 0, ""); +SYSCTL_ULONG(_machdep_pccard, OID_AUTO, mem_start, CTLFLAG_RW, + &mem_start, 0, ""); +SYSCTL_ULONG(_machdep_pccard, OID_AUTO, mem_end, CTLFLAG_RW, + &mem_end, 0, ""); /* * glue for NEWCARD/OLDCARD compat layer @@ -244,8 +244,8 @@ pccard_alloc_resource(device_t bus, device_t child, int type, int *rid, struct resource *res; if (start == 0 && end == ~0 && type == SYS_RES_MEMORY && count != 1) { - start = pcic_mem_start; - end = pcic_mem_end; + start = mem_start; + end = mem_end; } isdefault = (start == 0UL && end == ~0UL); if (!passthrough && !isdefault) { @@ -303,8 +303,6 @@ pccard_read_ivar(device_t bus, device_t child, int which, u_char *result) return ENOENT; } -/* Pass card requests up to pcic. This may mean a bad design XXX */ - static int pccard_set_res_flags(device_t bus, device_t child, int restype, int rid, u_long value)