d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move code macros from if_sis*reg*.h to if_sis.*c*

Browse Source
This commit is contained in:
Poul-Henning Kamp 2005-09-20 09:52:53 +00:00
parent 26b9c7716a
commit f38deea185
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/pci/if_sis.c
View File

@ -100,6 +100,22 @@ MODULE_DEPEND(sis, miibus, 1, 1, 1);
/* "controller miibus0" required. See GENERIC if you get errors here. */ /* "controller miibus0" required. See GENERIC if you get errors here. */
#include "miibus_if.h" #include "miibus_if.h"
#define SIS_LOCK(_sc) mtx_lock(&(_sc)->sis_mtx)
#define SIS_UNLOCK(_sc) mtx_unlock(&(_sc)->sis_mtx)
#define SIS_LOCK_ASSERT(_sc) mtx_assert(&(_sc)->sis_mtx, MA_OWNED)
/*
* register space access macros
*/
#define CSR_WRITE_4(sc, reg, val) \
bus_space_write_4(sc->sis_btag, sc->sis_bhandle, reg, val)
#define CSR_READ_4(sc, reg) \
bus_space_read_4(sc->sis_btag, sc->sis_bhandle, reg)
#define CSR_READ_2(sc, reg) \
bus_space_read_2(sc->sis_btag, sc->sis_bhandle, reg)
/* /*
* Various supported device vendors/types and their names. * Various supported device vendors/types and their names.
*/ */

16
sys/pci/if_sisreg.h
View File

@ -466,22 +466,6 @@ struct sis_softc {
struct mtx sis_mtx; struct mtx sis_mtx;
}; };
#define SIS_LOCK(_sc) mtx_lock(&(_sc)->sis_mtx)
#define SIS_UNLOCK(_sc) mtx_unlock(&(_sc)->sis_mtx)
#define SIS_LOCK_ASSERT(_sc) mtx_assert(&(_sc)->sis_mtx, MA_OWNED)
/*
* register space access macros
*/
#define CSR_WRITE_4(sc, reg, val) \
bus_space_write_4(sc->sis_btag, sc->sis_bhandle, reg, val)
#define CSR_READ_4(sc, reg) \
bus_space_read_4(sc->sis_btag, sc->sis_bhandle, reg)
#define CSR_READ_2(sc, reg) \
bus_space_read_2(sc->sis_btag, sc->sis_bhandle, reg)
#define SIS_TIMEOUT 1000 #define SIS_TIMEOUT 1000
#define ETHER_ALIGN 2 #define ETHER_ALIGN 2
#define SIS_RXLEN 1536 #define SIS_RXLEN 1536