Deleted Added
sdiff udiff text old ( 115988 ) new ( 133782 )
full compact
excavar.h (115988) excavar.h (133782)
1/* $FreeBSD: head/sys/dev/exca/excavar.h 115988 2003-06-07 20:46:39Z imp $ */
1/* $FreeBSD: head/sys/dev/exca/excavar.h 133782 2004-08-15 23:17:54Z imp $ */
2
3/*
4 * Copyright (c) 2002 M Warner Losh. All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:
9 * 1. Redistributions of source code must retain the above copyright

--- 62 unchanged lines hidden (view full) ---

72 int ioalloc;
73 struct pccard_io_handle io[EXCA_IO_WINS];
74 bus_space_tag_t bst;
75 bus_space_handle_t bsh;
76 uint32_t flags;
77#define EXCA_SOCKET_PRESENT 0x00000001
78#define EXCA_HAS_MEMREG_WIN 0x00000002
79#define EXCA_CARD_OK 0x00000004
2
3/*
4 * Copyright (c) 2002 M Warner Losh. All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:
9 * 1. Redistributions of source code must retain the above copyright

--- 62 unchanged lines hidden (view full) ---

72 int ioalloc;
73 struct pccard_io_handle io[EXCA_IO_WINS];
74 bus_space_tag_t bst;
75 bus_space_handle_t bsh;
76 uint32_t flags;
77#define EXCA_SOCKET_PRESENT 0x00000001
78#define EXCA_HAS_MEMREG_WIN 0x00000002
79#define EXCA_CARD_OK 0x00000004
80#define EXCA_KTHREAD_RUNNING 0x00000008
81#define EXCA_KTHREAD_DONE 0x00000010
80#define EXCA_EVENT 0x80000000
82 uint32_t offset;
83 int chipset;
84#define EXCA_CARDBUS 0
85#define EXCA_I82365 1 /* Intel i82365SL-A/B or clone */
86#define EXCA_I82365SL_DF 2 /* Intel i82365sl-DF step */
87#define EXCA_VLSI 3 /* VLSI chip */
88#define EXCA_PD6710 4 /* Cirrus logic PD6710 */
89#define EXCA_PD6722 5 /* Cirrus logic PD6722 */

--- 4 unchanged lines hidden (view full) ---

94#define EXCA_VG469 10 /* Vadem 469 */
95#define EXCA_RF5C296 11 /* Ricoh RF5C296 */
96#define EXCA_RF5C396 12 /* Ricoh RF5C396 */
97#define EXCA_IBM 13 /* IBM clone */
98#define EXCA_IBM_KING 14 /* IBM KING PCMCIA Controller */
99#define EXCA_BOGUS -1 /* Invalid/not present/etc */
100 exca_getb_fn *getb;
101 exca_putb_fn *putb;
81 uint32_t offset;
82 int chipset;
83#define EXCA_CARDBUS 0
84#define EXCA_I82365 1 /* Intel i82365SL-A/B or clone */
85#define EXCA_I82365SL_DF 2 /* Intel i82365sl-DF step */
86#define EXCA_VLSI 3 /* VLSI chip */
87#define EXCA_PD6710 4 /* Cirrus logic PD6710 */
88#define EXCA_PD6722 5 /* Cirrus logic PD6722 */

--- 4 unchanged lines hidden (view full) ---

93#define EXCA_VG469 10 /* Vadem 469 */
94#define EXCA_RF5C296 11 /* Ricoh RF5C296 */
95#define EXCA_RF5C396 12 /* Ricoh RF5C396 */
96#define EXCA_IBM 13 /* IBM clone */
97#define EXCA_IBM_KING 14 /* IBM KING PCMCIA Controller */
98#define EXCA_BOGUS -1 /* Invalid/not present/etc */
99 exca_getb_fn *getb;
100 exca_putb_fn *putb;
102 struct proc *event_thread;
103 struct mtx mtx;
104 struct cv cv;
105 device_t pccarddev;
101 device_t pccarddev;
102 uint32_t status; /* status, hw dependent */
106};
107
108void exca_init(struct exca_softc *sc, device_t dev,
109 bus_space_tag_t, bus_space_handle_t, uint32_t);
110void exca_insert(struct exca_softc *sc);
111int exca_io_map(struct exca_softc *sc, int width, struct resource *r);
112int exca_io_unmap_res(struct exca_softc *sc, struct resource *res);
113int exca_is_pcic(struct exca_softc *sc);

--- 42 unchanged lines hidden --- 		103};
104
105void exca_init(struct exca_softc *sc, device_t dev,
106 bus_space_tag_t, bus_space_handle_t, uint32_t);
107void exca_insert(struct exca_softc *sc);
108int exca_io_map(struct exca_softc *sc, int width, struct resource *r);
109int exca_io_unmap_res(struct exca_softc *sc, struct resource *res);
110int exca_is_pcic(struct exca_softc *sc);

--- 42 unchanged lines hidden ---