summaryrefslogtreecommitdiff
path: root/sys/arch/macppc/dev/xlights.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/macppc/dev/xlights.c')
-rw-r--r--sys/arch/macppc/dev/xlights.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/sys/arch/macppc/dev/xlights.c b/sys/arch/macppc/dev/xlights.c
index 8793070c851..daf2e0e2603 100644
--- a/sys/arch/macppc/dev/xlights.c
+++ b/sys/arch/macppc/dev/xlights.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xlights.c,v 1.4 2008/09/30 04:54:00 drahn Exp $ */
+/* $OpenBSD: xlights.c,v 1.5 2011/05/15 09:10:26 mpi Exp $ */
/*
* Copyright (c) 2007 Gordon Willem Klok <gwk@openbsd,org>
*
@@ -27,6 +27,7 @@
#include <machine/autoconf.h>
#include <macppc/dev/dbdma.h>
#include <macppc/dev/i2sreg.h>
+#include <macppc/pci/macobio.h>
struct xlights_softc {
struct device sc_dev;
@@ -55,8 +56,6 @@ void xlights_startdma(struct xlights_softc *);
void xlights_deferred(void *);
void xlights_theosDOT(void *);
void xlights_timeout(void *);
-extern void keylargo_fcr_enable(int, u_int32_t);
-extern void keylargo_fcr_disable(int, u_int32_t);
struct cfattach xlights_ca = {
sizeof(struct xlights_softc), xlights_match,
@@ -170,9 +169,9 @@ xlights_attach(struct device *parent, struct device *self, void *aux)
printf(": irq %d\n", sc->sc_intr);
- keylargo_fcr_enable(I2SClockOffset, I2S0EN);
+ macobio_enable(I2SClockOffset, I2S0EN);
out32rb(sc->sc_reg + I2S_INT, I2S_INT_CLKSTOPPEND);
- keylargo_fcr_disable(I2SClockOffset, I2S0CLKEN);
+ macobio_disable(I2SClockOffset, I2S0CLKEN);
for (error = 0; error < 1000; error++) {
if (in32rb(sc->sc_reg + I2S_INT) & I2S_INT_CLKSTOPPEND) {
error = 0;
@@ -189,7 +188,7 @@ xlights_attach(struct device *parent, struct device *self, void *aux)
type, IPL_AUDIO, xlights_intr, sc, sc->sc_dev.dv_xname);
out32rb(sc->sc_reg + I2S_FORMAT, CLKSRC_VS);
- keylargo_fcr_enable(I2SClockOffset, I2S0CLKEN);
+ macobio_enable(I2SClockOffset, I2S0CLKEN);
kthread_create_deferred(xlights_deferred, sc);
timeout_set(&sc->sc_tmo, xlights_timeout, sc);