CVS commit: src/sys/arch/mmeye/dev
Module Name:src
Committed By: thorpej
Date: Sat Nov 21 18:23:36 UTC 2020
Modified Files:
src/sys/arch/mmeye/dev: mmeyepcmcia.c
Log Message:
malloc(9) -> kmem(9)
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/mmeye/dev/mmeyepcmcia.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mmeye/dev/mmeyepcmcia.c
diff -u src/sys/arch/mmeye/dev/mmeyepcmcia.c:1.22 src/sys/arch/mmeye/dev/mmeyepcmcia.c:1.23
--- src/sys/arch/mmeye/dev/mmeyepcmcia.c:1.22 Sat Oct 27 17:18:03 2012
+++ src/sys/arch/mmeye/dev/mmeyepcmcia.c Sat Nov 21 18:23:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mmeyepcmcia.c,v 1.22 2012/10/27 17:18:03 chs Exp $ */
+/* $NetBSD: mmeyepcmcia.c,v 1.23 2020/11/21 18:23:36 thorpej Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
@@ -37,7 +37,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mmeyepcmcia.c,v 1.22 2012/10/27 17:18:03 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mmeyepcmcia.c,v 1.23 2020/11/21 18:23:36 thorpej Exp $");
#include
#include
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: mmeyepcmcia.
#include
#include
#include
-#include
+#include
#include
#include
@@ -408,9 +408,9 @@ mmeyepcmcia_event_thread(void *arg)
break;
if (pe2->pe_type == MMEYEPCMCIA_EVENT_INSERTION) {
SIMPLEQ_REMOVE_HEAD(>events, pe_q);
- free(pe1, M_TEMP);
+ kmem_free(pe1, sizeof(*pe1));
SIMPLEQ_REMOVE_HEAD(>events, pe_q);
- free(pe2, M_TEMP);
+ kmem_free(pe2, sizeof(*pe2));
}
}
splx(s);
@@ -432,9 +432,9 @@ mmeyepcmcia_event_thread(void *arg)
break;
if (pe2->pe_type == MMEYEPCMCIA_EVENT_REMOVAL) {
SIMPLEQ_REMOVE_HEAD(>events, pe_q);
- free(pe1, M_TEMP);
+ kmem_free(pe1, sizeof(*pe1));
SIMPLEQ_REMOVE_HEAD(>events, pe_q);
- free(pe2, M_TEMP);
+ kmem_free(pe2, sizeof(*pe2));
}
}
splx(s);
@@ -447,7 +447,7 @@ mmeyepcmcia_event_thread(void *arg)
panic("mmeyepcmcia_event_thread: unknown event %d",
pe->pe_type);
}
- free(pe, M_TEMP);
+ kmem_free(pe, sizeof(*pe));
}
h->event_thread = NULL;
@@ -590,7 +590,7 @@ mmeyepcmcia_queue_event(struct mmeyepcmc
struct mmeyepcmcia_event *pe;
int s;
- pe = malloc(sizeof(*pe), M_TEMP, M_NOWAIT);
+ pe = kmem_intr_alloc(sizeof(*pe), KM_NOSLEEP);
if (pe == NULL)
panic("mmeyepcmcia_queue_event: can't allocate event");
CVS commit: src/sys/arch/mmeye/dev
Module Name:src Committed By: kiyohara Date: Wed Feb 2 04:29:59 UTC 2011 Modified Files: src/sys/arch/mmeye/dev: mmeyepcmciareg.h Log Message: Indent. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/mmeye/dev/mmeyepcmciareg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mmeye/dev/mmeyepcmciareg.h diff -u src/sys/arch/mmeye/dev/mmeyepcmciareg.h:1.1 src/sys/arch/mmeye/dev/mmeyepcmciareg.h:1.2 --- src/sys/arch/mmeye/dev/mmeyepcmciareg.h:1.1 Sun Mar 24 18:08:46 2002 +++ src/sys/arch/mmeye/dev/mmeyepcmciareg.h Wed Feb 2 04:29:59 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mmeyepcmciareg.h,v 1.1 2002/03/24 18:08:46 uch Exp $ */ +/* $NetBSD: mmeyepcmciareg.h,v 1.2 2011/02/02 04:29:59 kiyohara Exp $ */ /* * Copyright (c) 1997 Marc Horowitz. All rights reserved. @@ -51,7 +51,7 @@ /* general setup registers */ -#define MMEYEPCMCIA_IDENT0x00 /* RO */ +#define MMEYEPCMCIA_IDENT 0x00 /* RO */ #define MMEYEPCMCIA_IDENT_IFTYPE_MASK 0xC0 #define MMEYEPCMCIA_IDENT_IFTYPE_IO_ONLY 0x00 #define MMEYEPCMCIA_IDENT_IFTYPE_MEM_ONLY 0x40 @@ -74,10 +74,10 @@ #define MMEYEPCMCIA_IF_STATUS_BATTERY_DEAD2 0x01 #define MMEYEPCMCIA_IF_STATUS_BATTERY_WARNING 0x02 #define MMEYEPCMCIA_IF_STATUS_BATTERY_GOOD 0x03 -#define MMEYEPCMCIA_IF_STATUS_RESET 0x08 -#define MMEYEPCMCIA_IF_STATUS_BUSWIDTH 0x40 +#define MMEYEPCMCIA_IF_STATUS_RESET 0x08 +#define MMEYEPCMCIA_IF_STATUS_BUSWIDTH 0x40 -#define MMEYEPCMCIA_PWRCTL0x02 /* RW */ +#define MMEYEPCMCIA_PWRCTL 0x02 /* RW */ #define MMEYEPCMCIA_PWRCTL_OE0x80 /* output enable */ #define MMEYEPCMCIA_PWRCTL_DISABLE_RESETDRV 0x40 #define MMEYEPCMCIA_PWRCTL_AUTOSWITCH_ENABLE 0x20 @@ -104,19 +104,19 @@ #define MMEYEPCMCIA_CSC_BATTDEAD 0x01 /* for memory cards */ #define MMEYEPCMCIA_CSC_RI0x01 /* for i/o cards */ -#define MMEYEPCMCIA_ADDRWIN_ENABLE 0x06 /* RW */ +#define MMEYEPCMCIA_ADDRWIN_ENABLE 0x06 /* RW */ #define MMEYEPCMCIA_ADDRWIN_ENABLE_IO1 0x80 #define MMEYEPCMCIA_ADDRWIN_ENABLE_IO0 0x40 #define MMEYEPCMCIA_ADDRWIN_ENABLE_MEMCS16 0x20 /* rtfds if you care */ -#define MMEYEPCMCIA_ADDRWIN_ENABLE_MEM4 0x10 -#define MMEYEPCMCIA_ADDRWIN_ENABLE_MEM3 0x08 -#define MMEYEPCMCIA_ADDRWIN_ENABLE_MEM2 0x04 -#define MMEYEPCMCIA_ADDRWIN_ENABLE_MEM1 0x02 -#define MMEYEPCMCIA_ADDRWIN_ENABLE_MEM0 0x01 +#define MMEYEPCMCIA_ADDRWIN_ENABLE_MEM4 0x10 +#define MMEYEPCMCIA_ADDRWIN_ENABLE_MEM3 0x08 +#define MMEYEPCMCIA_ADDRWIN_ENABLE_MEM2 0x04 +#define MMEYEPCMCIA_ADDRWIN_ENABLE_MEM1 0x02 +#define MMEYEPCMCIA_ADDRWIN_ENABLE_MEM0 0x01 #define MMEYEPCMCIA_CARD_DETECT 0x16 /* RW */ #define MMEYEPCMCIA_CARD_DETECT_RESERVED 0xC0 -#define MMEYEPCMCIA_CARD_DETECT_SW_INTR 0x20 +#define MMEYEPCMCIA_CARD_DETECT_SW_INTR 0x20 #define MMEYEPCMCIA_CARD_DETECT_RESUME_ENABLE 0x10 #define MMEYEPCMCIA_CARD_DETECT_GPI_TRANSCTL 0x08 #define MMEYEPCMCIA_CARD_DETECT_GPI_ENABLE 0x04 @@ -125,13 +125,13 @@ /* interrupt registers */ -#define MMEYEPCMCIA_INTR0x03 /* RW */ +#define MMEYEPCMCIA_INTR 0x03 /* RW */ #define MMEYEPCMCIA_INTR_RI_ENABLE 0x80 #define MMEYEPCMCIA_INTR_RESET0x40 /* active low (zero) */ #define MMEYEPCMCIA_INTR_CARDTYPE_MASK 0x20 #define MMEYEPCMCIA_INTR_CARDTYPE_IO 0x20 #define MMEYEPCMCIA_INTR_CARDTYPE_MEM 0x00 -#define MMEYEPCMCIA_INTR_ENABLE 0x10 +#define MMEYEPCMCIA_INTR_ENABLE0x10 #define MMEYEPCMCIA_INTR_IRQ_MASK 0x0F #define MMEYEPCMCIA_INTR_IRQ_SHIFT 0 #define MMEYEPCMCIA_INTR_IRQ_NONE 0x00 @@ -147,13 +147,13 @@ #define MMEYEPCMCIA_INTR_IRQ100x0A #define MMEYEPCMCIA_INTR_IRQ110x0B #define MMEYEPCMCIA_INTR_IRQ120x0C -#define MMEYEPCMCIA_INTR_IRQ_RESERVED13 0x0D +#define MMEYEPCMCIA_INTR_IRQ_RESERVED13 0x0D #define MMEYEPCMCIA_INTR_IRQ140x0E #define MMEYEPCMCIA_INTR_IRQ150x0F #define MMEYEPCMCIA_INTR_IRQ_VALIDMASK 0xDEB8 /* 1101 1110 1011 1000 */ -#define MMEYEPCMCIA_CSC_INTR0x05 /* RW */ +#define MMEYEPCMCIA_CSC_INTR 0x05 /* RW */ #define MMEYEPCMCIA_CSC_INTR_IRQ_MASK 0xF0 #define MMEYEPCMCIA_CSC_INTR_IRQ_SHIFT 4 #define MMEYEPCMCIA_CSC_INTR_IRQ_NONE 0x00 @@ -184,8 +184,8 @@ #define MMEYEPCMCIA_IO_WINS2 -#define MMEYEPCMCIA_IOCTL0x07 /* RW */ -#define MMEYEPCMCIA_IOCTL_IO1_WAITSTATE 0x80 +#define MMEYEPCMCIA_IOCTL 0x07 /* RW */ +#define MMEYEPCMCIA_IOCTL_IO1_WAITSTATE 0x80 #define MMEYEPCMCIA_IOCTL_IO1_ZEROWAIT 0x40 #define MMEYEPCMCIA_IOCTL_IO1_IOCS16SRC_MASK 0x20 #define MMEYEPCMCIA_IOCTL_IO1_IOCS16SRC_CARD 0x20 @@ -193,7 +193,7 @@ #define MMEYEPCMCIA_IOCTL_IO1_DATASIZE_MASK 0x10 #define MMEYEPCMCIA_IOCTL_IO1_DATASIZE_16BIT 0x10 #define MMEYEPCMCIA_IOCTL_IO1_DATASIZE_8BIT 0x00 -#define MMEYEPCMCIA_IOCTL_IO0_WAITSTATE 0x08 +#define MMEYEPCMCIA_IOCTL_IO0_WAITSTATE 0x08 #define MMEYEPCMCIA_IOCTL_IO0_ZEROWAIT 0x04
CVS commit: src/sys/arch/mmeye/dev
Module Name:src
Committed By: kiyohara
Date: Wed Feb 2 04:46:25 UTC 2011
Modified Files:
src/sys/arch/mmeye/dev: com_mainbus.c
Log Message:
Use cf_name to match instead of cd_name.
Call com_is_console().
Using bus_space_tag_t and bus_space_handle_t is manners for more machines.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/mmeye/dev/com_mainbus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mmeye/dev/com_mainbus.c
diff -u src/sys/arch/mmeye/dev/com_mainbus.c:1.9 src/sys/arch/mmeye/dev/com_mainbus.c:1.10
--- src/sys/arch/mmeye/dev/com_mainbus.c:1.9 Mon Apr 28 20:23:29 2008
+++ src/sys/arch/mmeye/dev/com_mainbus.c Wed Feb 2 04:46:25 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: com_mainbus.c,v 1.9 2008/04/28 20:23:29 martin Exp $ */
+/* $NetBSD: com_mainbus.c,v 1.10 2011/02/02 04:46:25 kiyohara Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: com_mainbus.c,v 1.9 2008/04/28 20:23:29 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: com_mainbus.c,v 1.10 2011/02/02 04:46:25 kiyohara Exp $);
#include sys/param.h
#include sys/systm.h
@@ -70,10 +70,9 @@
int
com_mainbus_match(device_t parent, cfdata_t match, void *aux)
{
- extern struct cfdriver com_cd;
struct mainbus_attach_args *ma = aux;
- if (strcmp(ma-ma_name, com_cd.cd_name) == 0)
+ if (strcmp(ma-ma_name, match-cf_name) == 0)
return (1);
return (0);
@@ -85,13 +84,20 @@
struct mainbus_attach_args *ma = aux;
struct com_mainbus_softc *sc = device_private(self);
struct com_softc *csc = sc-sc_com;
+ const bus_space_tag_t iot = 0;
+ bus_space_handle_t ioh;
+ if (!com_is_console(iot, ma-ma_addr1, ioh))
+ if (bus_space_map(iot, ma-ma_addr1, COM_NPORTS, 0, ioh)) {
+ aprint_error(: can't map i/o space\n);
+ return;
+ }
csc-sc_dev = self;
csc-sc_frequency = COM_FREQ;
- COM_INIT_REGS(csc-sc_regs, 0, ma-ma_addr1, 0);
+ COM_INIT_REGS(csc-sc_regs, iot, ioh, ma-ma_addr1);
/* sanity check */
- if (!comprobe1(0, ma-ma_addr1)) {
+ if (!comprobe1(iot, ioh)) {
aprint_error(: device problem. don't attach.\n);
return;
}
@@ -115,7 +121,8 @@
void
comcninit(struct consdev *cp)
{
+ const bus_space_tag_t iot = 0;
- comcnattach(0, CONADDR, COMCN_SPEED, COM_FREQ, COM_TYPE_NORMAL,
+ comcnattach(iot, CONADDR, COMCN_SPEED, COM_FREQ, COM_TYPE_NORMAL,
CONMODE);
}
CVS commit: src/sys/arch/mmeye/dev
Module Name:src Committed By: kiyohara Date: Wed Feb 2 05:00:57 UTC 2011 Modified Files: src/sys/arch/mmeye/dev: mmeyepcmcia.c Log Message: Change to static functions. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/mmeye/dev/mmeyepcmcia.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mmeye/dev/mmeyepcmcia.c diff -u src/sys/arch/mmeye/dev/mmeyepcmcia.c:1.15 src/sys/arch/mmeye/dev/mmeyepcmcia.c:1.16 --- src/sys/arch/mmeye/dev/mmeyepcmcia.c:1.15 Mon Mar 16 23:11:13 2009 +++ src/sys/arch/mmeye/dev/mmeyepcmcia.c Wed Feb 2 05:00:56 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mmeyepcmcia.c,v 1.15 2009/03/16 23:11:13 dsl Exp $ */ +/* $NetBSD: mmeyepcmcia.c,v 1.16 2011/02/02 05:00:56 kiyohara Exp $ */ /* * Copyright (c) 1997 Marc Horowitz. All rights reserved. @@ -37,7 +37,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: mmeyepcmcia.c,v 1.15 2009/03/16 23:11:13 dsl Exp $); +__KERNEL_RCSID(0, $NetBSD: mmeyepcmcia.c,v 1.16 2011/02/02 05:00:56 kiyohara Exp $); #include sys/types.h #include sys/param.h @@ -167,30 +167,31 @@ struct mmeyepcmcia_handle handle[MMEYEPCMCIA_NSLOTS]; }; -void mmeyepcmcia_attach_sockets(struct mmeyepcmcia_softc *); -int mmeyepcmcia_intr(void *arg); +static void mmeyepcmcia_attach_sockets(struct mmeyepcmcia_softc *); +static int mmeyepcmcia_intr(void *arg); static inline int mmeyepcmcia_read(struct mmeyepcmcia_handle *, int); static inline void mmeyepcmcia_write(struct mmeyepcmcia_handle *, int, int); -int mmeyepcmcia_chip_mem_alloc(pcmcia_chipset_handle_t, bus_size_t, - struct pcmcia_mem_handle *); -void mmeyepcmcia_chip_mem_free(pcmcia_chipset_handle_t, - struct pcmcia_mem_handle *); -int mmeyepcmcia_chip_mem_map(pcmcia_chipset_handle_t, int, bus_addr_t, - bus_size_t, struct pcmcia_mem_handle *, bus_size_t *, int *); -void mmeyepcmcia_chip_mem_unmap(pcmcia_chipset_handle_t, int); - -int mmeyepcmcia_chip_io_alloc(pcmcia_chipset_handle_t, bus_addr_t, - bus_size_t, bus_size_t, struct pcmcia_io_handle *); -void mmeyepcmcia_chip_io_free(pcmcia_chipset_handle_t, - struct pcmcia_io_handle *); -int mmeyepcmcia_chip_io_map(pcmcia_chipset_handle_t, int, bus_addr_t, - bus_size_t, struct pcmcia_io_handle *, int *); -void mmeyepcmcia_chip_io_unmap(pcmcia_chipset_handle_t, int); +static int mmeyepcmcia_chip_mem_alloc(pcmcia_chipset_handle_t, bus_size_t, + struct pcmcia_mem_handle *); +static void mmeyepcmcia_chip_mem_free(pcmcia_chipset_handle_t, + struct pcmcia_mem_handle *); +static int mmeyepcmcia_chip_mem_map(pcmcia_chipset_handle_t, int, + bus_addr_t, bus_size_t, struct pcmcia_mem_handle *, + bus_size_t *, int *); +static void mmeyepcmcia_chip_mem_unmap(pcmcia_chipset_handle_t, int); + +static int mmeyepcmcia_chip_io_alloc(pcmcia_chipset_handle_t, bus_addr_t, + bus_size_t, bus_size_t, struct pcmcia_io_handle *); +static void mmeyepcmcia_chip_io_free(pcmcia_chipset_handle_t, + struct pcmcia_io_handle *); +static int mmeyepcmcia_chip_io_map(pcmcia_chipset_handle_t, int, + bus_addr_t, bus_size_t, struct pcmcia_io_handle *, int *); +static void mmeyepcmcia_chip_io_unmap(pcmcia_chipset_handle_t, int); -void mmeyepcmcia_chip_socket_enable(pcmcia_chipset_handle_t); -void mmeyepcmcia_chip_socket_disable(pcmcia_chipset_handle_t); +static void mmeyepcmcia_chip_socket_enable(pcmcia_chipset_handle_t); +static void mmeyepcmcia_chip_socket_disable(pcmcia_chipset_handle_t); static inline int mmeyepcmcia_read(struct mmeyepcmcia_handle *, int); static inline int @@ -217,26 +218,27 @@ bus_space_write_stream_2(h-sc-iot, h-sc-ioh, idx, (data)); } -void *mmeyepcmcia_chip_intr_establish(pcmcia_chipset_handle_t, - struct pcmcia_function *, int, int (*) (void *), void *); -void mmeyepcmcia_chip_intr_disestablish(pcmcia_chipset_handle_t, void *); -void *mmeyepcmcia_chip_intr_establish(pcmcia_chipset_handle_t, - struct pcmcia_function *, int, int (*) (void *), void *); -void mmeyepcmcia_chip_intr_disestablish(pcmcia_chipset_handle_t, - void *); - -void mmeyepcmcia_attach_socket(struct mmeyepcmcia_handle *); -void mmeyepcmcia_init_socket(struct mmeyepcmcia_handle *); -int mmeyepcmcia_print (void *, const char *); -int mmeyepcmcia_intr_socket(struct mmeyepcmcia_handle *); -void mmeyepcmcia_attach_card(struct mmeyepcmcia_handle *); -void mmeyepcmcia_detach_card(struct mmeyepcmcia_handle *, int); -void mmeyepcmcia_deactivate_card(struct mmeyepcmcia_handle *); -void mmeyepcmcia_event_thread(void *); -void mmeyepcmcia_queue_event(struct mmeyepcmcia_handle *, int); +static void *mmeyepcmcia_chip_intr_establish(pcmcia_chipset_handle_t, + struct pcmcia_function *, int, int (*) (void *), void *); +static void mmeyepcmcia_chip_intr_disestablish(pcmcia_chipset_handle_t, + void *); +static void *mmeyepcmcia_chip_intr_establish(pcmcia_chipset_handle_t, + struct
CVS commit: src/sys/arch/mmeye/dev
Module Name:src
Committed By: kiyohara
Date: Wed Feb 2 05:06:31 UTC 2011
Modified Files:
src/sys/arch/mmeye/dev: mmeyepcmcia.c
Log Message:
Add socket_settype of struct pcmcia_chip_functions. Always need it.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/mmeye/dev/mmeyepcmcia.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mmeye/dev/mmeyepcmcia.c
diff -u src/sys/arch/mmeye/dev/mmeyepcmcia.c:1.16 src/sys/arch/mmeye/dev/mmeyepcmcia.c:1.17
--- src/sys/arch/mmeye/dev/mmeyepcmcia.c:1.16 Wed Feb 2 05:00:56 2011
+++ src/sys/arch/mmeye/dev/mmeyepcmcia.c Wed Feb 2 05:06:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mmeyepcmcia.c,v 1.16 2011/02/02 05:00:56 kiyohara Exp $ */
+/* $NetBSD: mmeyepcmcia.c,v 1.17 2011/02/02 05:06:31 kiyohara Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mmeyepcmcia.c,v 1.16 2011/02/02 05:00:56 kiyohara Exp $);
+__KERNEL_RCSID(0, $NetBSD: mmeyepcmcia.c,v 1.17 2011/02/02 05:06:31 kiyohara Exp $);
#include sys/types.h
#include sys/param.h
@@ -192,6 +192,7 @@
static void mmeyepcmcia_chip_socket_enable(pcmcia_chipset_handle_t);
static void mmeyepcmcia_chip_socket_disable(pcmcia_chipset_handle_t);
+static void mmeyepcmcia_chip_socket_settype(pcmcia_chipset_handle_t, int);
static inline int mmeyepcmcia_read(struct mmeyepcmcia_handle *, int);
static inline int
@@ -259,6 +260,8 @@
mmeyepcmcia_chip_socket_enable,
mmeyepcmcia_chip_socket_disable,
+ mmeyepcmcia_chip_socket_settype,
+ NULL,
};
static int
@@ -891,3 +894,8 @@
mmeyepcmcia_chip_socket_disable(pcmcia_chipset_handle_t pch)
{
}
+
+static void
+mmeyepcmcia_chip_socket_settype(pcmcia_chipset_handle_t pch, int type)
+{
+}
CVS commit: src/sys/arch/mmeye/dev
Module Name:src Committed By: kiyohara Date: Wed Feb 2 05:10:55 UTC 2011 Modified Files: src/sys/arch/mmeye/dev: mmeyepcmcia.c Log Message: Remove unused macros. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/mmeye/dev/mmeyepcmcia.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mmeye/dev/mmeyepcmcia.c diff -u src/sys/arch/mmeye/dev/mmeyepcmcia.c:1.17 src/sys/arch/mmeye/dev/mmeyepcmcia.c:1.18 --- src/sys/arch/mmeye/dev/mmeyepcmcia.c:1.17 Wed Feb 2 05:06:31 2011 +++ src/sys/arch/mmeye/dev/mmeyepcmcia.c Wed Feb 2 05:10:55 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mmeyepcmcia.c,v 1.17 2011/02/02 05:06:31 kiyohara Exp $ */ +/* $NetBSD: mmeyepcmcia.c,v 1.18 2011/02/02 05:10:55 kiyohara Exp $ */ /* * Copyright (c) 1997 Marc Horowitz. All rights reserved. @@ -37,7 +37,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: mmeyepcmcia.c,v 1.17 2011/02/02 05:06:31 kiyohara Exp $); +__KERNEL_RCSID(0, $NetBSD: mmeyepcmcia.c,v 1.18 2011/02/02 05:10:55 kiyohara Exp $); #include sys/types.h #include sys/param.h @@ -104,17 +104,12 @@ }; /* These four lines are MMTA specific */ -#define MMEYEPCMCIA_IRQ1 10 -#define MMEYEPCMCIA_IRQ2 9 -#define MMEYEPCMCIA_SLOT1_ADDR 0xb800 -#define MMEYEPCMCIA_SLOT2_ADDR 0xb900 - -#define MMEYEPCMCIA_FLAG_SOCKETP 0x0001 #define MMEYEPCMCIA_FLAG_CARDP 0x0002 +#define MMEYEPCMCIA_FLAG_SOCKETP 0x0001 #define MMEYEPCMCIA_LASTSTATE_PRESENT 0x0002 -#define MMEYEPCMCIA_LASTSTATE_HALF 0x0001 -#define MMEYEPCMCIA_LASTSTATE_EMPTY 0x +#define MMEYEPCMCIA_LASTSTATE_HALF 0x0001 +#define MMEYEPCMCIA_LASTSTATE_EMPTY 0x /* * This is sort of arbitrary. It merely needs to be enough. It can be @@ -122,7 +117,6 @@ */ #define MMEYEPCMCIA_MEM_PAGES 4 -#define MMEYEPCMCIA_MEMSIZE MMEYEPCMCIA_MEM_PAGES*MMEYEPCMCIA_MEM_PAGESIZE #define MMEYEPCMCIA_NSLOTS 1
