diff --git a/sys/dev/iicbus/twsi/mv_twsi.c b/sys/dev/iicbus/twsi/mv_twsi.c --- a/sys/dev/iicbus/twsi/mv_twsi.c +++ b/sys/dev/iicbus/twsi/mv_twsi.c @@ -61,9 +61,7 @@ #include #include -#ifdef EXT_RESOURCES #include -#endif #include #include diff --git a/sys/dev/iicbus/twsi/twsi.h b/sys/dev/iicbus/twsi/twsi.h --- a/sys/dev/iicbus/twsi/twsi.h +++ b/sys/dev/iicbus/twsi/twsi.h @@ -34,9 +34,7 @@ #ifndef _TWSI_H_ #define _TWSI_H_ -#ifdef EXT_RESOURCES #include -#endif struct twsi_baud_rate { uint32_t raw; @@ -50,10 +48,8 @@ struct resource *res[2]; struct mtx mutex; device_t iicbus; -#ifdef EXT_RESOURCES clk_t clk_core; clk_t clk_reg; -#endif void * intrhand; bool have_intr; diff --git a/sys/dev/iicbus/twsi/twsi.c b/sys/dev/iicbus/twsi/twsi.c --- a/sys/dev/iicbus/twsi/twsi.c +++ b/sys/dev/iicbus/twsi/twsi.c @@ -246,7 +246,6 @@ return (IIC_NOERR); } -#ifdef EXT_RESOURCES #define TWSI_BAUD_RATE_RAW(C,M,N) ((C)/((10*(M+1))<<(N))) #define ABSSUB(a,b) (((a) > (b)) ? (a) - (b) : (b) - (a)) @@ -281,7 +280,6 @@ return (0); } -#endif /* EXT_RESOURCES */ /* * Only slave mode supported, disregard [old]addr @@ -291,17 +289,13 @@ { struct twsi_softc *sc; uint32_t param; -#ifdef EXT_RESOURCES u_int busfreq; -#endif sc = device_get_softc(dev); -#ifdef EXT_RESOURCES busfreq = IICBUS_GET_FREQUENCY(sc->iicbus, speed); if (twsi_calc_baud_rate(sc, busfreq, ¶m) == -1) { -#endif switch (speed) { case IIC_SLOW: case IIC_FAST: @@ -315,9 +309,7 @@ debugf(sc, "Using IIC_FASTEST/UNKNOWN mode with speed param=%x\n", param); break; } -#ifdef EXT_RESOURCES } -#endif debugf(sc, "Using clock param=%x\n", param);