 @@ -1,14 +1,14 @@
-/*	$NetBSD: harmony.c,v 1.12 2008/07/04 11:18:02 skrll Exp $	*/
+/*	$NetBSD: harmony.c,v 1.13 2008/09/23 14:07:11 mjf Exp $	*/
 /*	$OpenBSD: harmony.c,v 1.23 2004/02/13 21:28:19 mickey Exp $	*/
 /*
  * Copyright (c) 2003 Jason L. Wright (jason@thought.net)
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -117,30 +117,32 @@ const struct audio_hw_if harmony_sa_hw_i
 int harmony_match(device_t, struct cfdata *, void *);
 void harmony_attach(device_t, device_t, void *);
 CFATTACH_DECL_NEW(harmony, sizeof(struct harmony_softc),
     harmony_match, harmony_attach, NULL, NULL);
 int harmony_intr(void *);
 void harmony_intr_enable(struct harmony_softc *);
 void harmony_intr_disable(struct harmony_softc *);
 uint32_t harmony_speed_bits(struct harmony_softc *, u_int *);
 int harmony_set_gainctl(struct harmony_softc *);
 void harmony_reset_codec(struct harmony_softc *);
-void harmony_start_cp(struct harmony_softc *);
+void harmony_start_cp(struct harmony_softc *, int);
 void harmony_start_pp(struct harmony_softc *, int);
 void harmony_tick_pb(void *);
 void harmony_tick_cp(void *);
-void harmony_try_more(struct harmony_softc *);
+void harmony_try_more(struct harmony_softc *, int, int,
 	struct harmony_channel *);
 #if NRND > 0
 void harmony_acc_tmo(void *);
 #define	ADD_CLKALLICA(sc) do {						\
 	(sc)->sc_acc <<= 1;						\
 	(sc)->sc_acc |= READ_REG((sc), HARMONY_DIAG) & DIAG_CO;		\
 	if ((sc)->sc_acc_cnt++ && !((sc)->sc_acc_cnt % 32))		\
 		rnd_add_uint32(&(sc)->sc_rnd_source,			\
 			       (sc)->sc_acc_num ^= (sc)->sc_acc);	\
 } while(0)
 #endif
 int
 @@ -317,75 +319,47 @@ harmony_acc_tmo(void *v)
 	sc = v;
 	ADD_CLKALLICA(sc);
 	callout_schedule(&sc->sc_acc_tmo, 1);
+}
 #endif
 /*
  * interrupt handler
  */
 int
 harmony_intr(void *vsc)
+{
 	struct harmony_softc *sc;
 	struct harmony_channel *c;
 	uint32_t dstatus;
 	int r;
 	sc = vsc;
 	r = 0;
 #if NRND > 0
 	ADD_CLKALLICA(sc);
 #endif
 	harmony_intr_disable(sc);
 	dstatus = READ_REG(sc, HARMONY_DSTATUS);
-	if (sc->sc_playing && (dstatus & DSTATUS_PN)) {
+	if (dstatus & DSTATUS_PN) {
 		struct harmony_dma *d;
 		bus_addr_t nextaddr;
 		bus_size_t togo;
 		r = 1;
-		c = &sc->sc_playback;
+		harmony_start_pp(sc, 0);
 		d = c->c_current;
 		togo = c->c_segsz - c->c_cnt;
 		if (togo == 0) {
 			nextaddr = d->d_map->dm_segs[0].ds_addr;
 			c->c_cnt = togo = c->c_blksz;
 		} else {
 			nextaddr = c->c_lastaddr;
 			if (togo > c->c_blksz)
 				togo = c->c_blksz;
 			c->c_cnt += togo;
 		bus_dmamap_sync(sc->sc_dmat, d->d_map,
 		    nextaddr - d->d_map->dm_segs[0].ds_addr,
 		    c->c_blksz, BUS_DMASYNC_PREWRITE);
 		WRITE_REG(sc, HARMONY_PNXTADD, nextaddr);
 		SYNC_REG(sc, HARMONY_PNXTADD, BUS_SPACE_BARRIER_WRITE);
 		c->c_lastaddr = nextaddr + togo;
 		harmony_try_more(sc);
+	}
 	if (dstatus & DSTATUS_RN) {
 		c = &sc->sc_capture;
 		r = 1;
-		harmony_start_cp(sc);
+		harmony_start_cp(sc, 0);
 		if (sc->sc_capturing && c->c_intr != NULL)
 			(*c->c_intr)(c->c_intrarg);
+	}
 	if (READ_REG(sc, HARMONY_OV) & OV_OV) {
 		sc->sc_ov = 1;
 		WRITE_REG(sc, HARMONY_OV, 0);
 	} else
 		sc->sc_ov = 0;
 	harmony_intr_enable(sc);
 	return r;
+}
 @@ -1076,77 +1050,56 @@ int
 harmony_get_props(void *vsc)
+{
 	return AUDIO_PROP_FULLDUPLEX;
+}
 int
 harmony_trigger_output(void *vsc, void *start, void *end, int blksize,
     void (*intr)(void *), void *intrarg, const audio_params_t *param)
+{
 	struct harmony_softc *sc;
 	struct harmony_channel *c;
 	struct harmony_dma *d;
 	bus_addr_t nextaddr;
 	bus_size_t togo;
 	sc = vsc;
 	c = &sc->sc_playback;
 	for (d = sc->sc_dmas; d->d_kva != start; d = d->d_next)
 		continue;
 	if (d == NULL) {
 		printf("%s: trigger_output: bad addr: %p\n",
 		    device_xname(sc->sc_dv), start);
 		return EINVAL;
+	}
 	c->c_intr = intr;
 	c->c_intrarg = intrarg;
 	c->c_blksz = blksize;
 	c->c_current = d;
 	c->c_segsz = (char *)end - (char *)start;
 	c->c_cnt = 0;
 	c->c_lastaddr = d->d_map->dm_segs[0].ds_addr;
 	sc->sc_playing = 1;
-	togo = c->c_segsz - c->c_cnt;
+	harmony_start_pp(sc, 1);
-	if (togo == 0) {
+	harmony_start_cp(sc, 0);
 		nextaddr = d->d_map->dm_segs[0].ds_addr;
 		c->c_cnt = togo = c->c_blksz;
 	} else {
 		nextaddr = c->c_lastaddr;
 		if (togo > c->c_blksz)
 			togo = c->c_blksz;
 		c->c_cnt += togo;
 	bus_dmamap_sync(sc->sc_dmat, d->d_map,
 	    nextaddr - d->d_map->dm_segs[0].ds_addr,
 	    c->c_blksz, BUS_DMASYNC_PREWRITE);
 	WRITE_REG(sc, HARMONY_PNXTADD, nextaddr);
 	c->c_theaddr = nextaddr;
 	SYNC_REG(sc, HARMONY_PNXTADD, BUS_SPACE_BARRIER_WRITE);
 	c->c_lastaddr = nextaddr + togo;
 	harmony_start_cp(sc);
 	harmony_intr_enable(sc);
 	return 0;
+}
 void
-harmony_start_cp(struct harmony_softc *sc)
+harmony_start_cp(struct harmony_softc *sc, int start)
+{
 	struct harmony_channel *c;
 	struct harmony_dma *d;
 	bus_addr_t nextaddr;
 	bus_size_t togo;
 	c = &sc->sc_capture;
 	if (sc->sc_capturing == 0) {
 		WRITE_REG(sc, HARMONY_RNXTADD,
 		    sc->sc_capture_paddrs[sc->sc_capture_empty]);
 		if (++sc->sc_capture_empty == CAPTURE_EMPTYS)
 			sc->sc_capture_empty = 0;
 	} else {
 @@ -1157,35 +1110,82 @@ harmony_start_cp(struct harmony_softc *s
 			c->c_cnt = togo = c->c_blksz;
 		} else {
 			nextaddr = c->c_lastaddr;
 			if (togo > c->c_blksz)
 				togo = c->c_blksz;
 			c->c_cnt += togo;
+		}
 		bus_dmamap_sync(sc->sc_dmat, d->d_map,
 		    nextaddr - d->d_map->dm_segs[0].ds_addr,
 		    c->c_blksz, BUS_DMASYNC_PREWRITE);
 		WRITE_REG(sc, HARMONY_RNXTADD, nextaddr);
 		if (start)
 			c->c_theaddr = nextaddr;
 		SYNC_REG(sc, HARMONY_RNXTADD, BUS_SPACE_BARRIER_WRITE);
 		c->c_lastaddr = nextaddr + togo;
 		harmony_try_more(sc, HARMONY_RCURADD,
 		    RCURADD_BUFMASK, &sc->sc_capture);
+	}
 #if NRND > 0
 	callout_schedule(&sc->sc_acc_tmo, 1);
 #endif
+}
 void
 harmony_start_pp(struct harmony_softc *sc, int start)
+{
 	struct harmony_channel *c;
 	struct harmony_dma *d;
 	bus_addr_t nextaddr;
 	bus_size_t togo;
 	c = &sc->sc_playback;
 	if (sc->sc_playing == 0) {
 		WRITE_REG(sc, HARMONY_PNXTADD,
 		    sc->sc_playback_paddrs[sc->sc_playback_empty]);
 		if (++sc->sc_playback_empty == PLAYBACK_EMPTYS)
 			sc->sc_playback_empty = 0;
 	} else {
 		d = c->c_current;
 		togo = c->c_segsz - c->c_cnt;
 		if (togo == 0) {
 			nextaddr = d->d_map->dm_segs[0].ds_addr;
 			c->c_cnt = togo = c->c_blksz;
 		} else {
 			nextaddr = c->c_lastaddr;
 			if (togo > c->c_blksz)
 				togo = c->c_blksz;
 			c->c_cnt += togo;
+		}
 		bus_dmamap_sync(sc->sc_dmat, d->d_map,
 		    nextaddr - d->d_map->dm_segs[0].ds_addr,
 		    c->c_blksz, BUS_DMASYNC_PREWRITE);
 		WRITE_REG(sc, HARMONY_PNXTADD, nextaddr);
 		if (start)
 			c->c_theaddr = nextaddr;
 		SYNC_REG(sc, HARMONY_PNXTADD, BUS_SPACE_BARRIER_WRITE);
 		c->c_lastaddr = nextaddr + togo;
 		harmony_try_more(sc, HARMONY_PCURADD,
 		    PCURADD_BUFMASK, &sc->sc_playback);
+	}
+}
 int
 harmony_trigger_input(void *vsc, void *start, void *end, int blksize,
     void (*intr)(void *), void *intrarg, const audio_params_t *param)
+{
 	struct harmony_softc *sc;
 	struct harmony_channel *c;
 	struct harmony_dma *d;
 	sc = vsc;
 	c = &sc->sc_capture;
 	for (d = sc->sc_dmas; d->d_kva != start; d = d->d_next)
 		continue;
 	if (d == NULL) {
 @@ -1193,28 +1193,31 @@ harmony_trigger_input(void *vsc, void *s
 		    device_xname(sc->sc_dv), start);
 		return EINVAL;
+	}
 	c->c_intr = intr;
 	c->c_intrarg = intrarg;
 	c->c_blksz = blksize;
 	c->c_current = d;
 	c->c_segsz = (char *)end - (char *)start;
 	c->c_cnt = 0;
 	c->c_lastaddr = d->d_map->dm_segs[0].ds_addr;
 	sc->sc_capturing = 1;
 	harmony_start_cp(sc);
 	harmony_start_pp(sc, 0);
 	harmony_start_cp(sc, 1);
 	harmony_intr_enable(sc);
 	return 0;
+}
 static const struct speed_struct {
 	uint32_t speed;
 	uint32_t bits;
 } harmony_speeds[] = {
 	{ 5125, CNTL_RATE_5125 },
 	{ 6615, CNTL_RATE_6615 },
 	{ 8000, CNTL_RATE_8000 },
 	{ 9600, CNTL_RATE_9600 },
 	{ 11025, CNTL_RATE_11025 },
 	{ 16000, CNTL_RATE_16000 },
 @@ -1305,37 +1308,36 @@ harmony_set_gainctl(struct harmony_softc
 		bits |= GAINCTL_SE;
 	else
 		bits |= GAINCTL_HE;
 	mask = GAINCTL_LE | GAINCTL_HE | GAINCTL_SE | GAINCTL_IS_MASK;
 	old = bus_space_read_4(sc->sc_bt, sc->sc_bh, HARMONY_GAINCTL);
 	bus_space_write_4(sc->sc_bt, sc->sc_bh, HARMONY_GAINCTL, bits);
 	if ((old & mask) != (bits & mask))
 		return 1;
 	return 0;
+}
 void
-harmony_try_more(struct harmony_softc *sc)
+harmony_try_more(struct harmony_softc *sc, int curadd, int bufmask,
 	struct harmony_channel *c)
+{
 	struct harmony_channel *c;
 	struct harmony_dma *d;
 	uint32_t cur;
 	int i, nsegs;
 	c = &sc->sc_playback;
 	d = c->c_current;
-	cur = bus_space_read_4(sc->sc_bt, sc->sc_bh, HARMONY_PCURADD);
+	cur = bus_space_read_4(sc->sc_bt, sc->sc_bh, curadd);
-	cur &= PCURADD_BUFMASK;
+	cur &= bufmask;
 	nsegs = 0;
 #ifdef DIAGNOSTIC
 	if (cur < d->d_map->dm_segs[0].ds_addr ||
 	    cur >= (d->d_map->dm_segs[0].ds_addr + c->c_segsz))
 		panic("%s: bad current %x < %lx || %x > %lx",
 		    device_xname(sc->sc_dv), cur,
 		    d->d_map->dm_segs[0].ds_addr, cur,
 		    d->d_map->dm_segs[0].ds_addr + c->c_segsz);
 #endif /* DIAGNOSTIC */
 	if (cur > c->c_theaddr) {
 		nsegs = (cur - c->c_theaddr) / HARMONY_BUFSIZE;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: harmonyreg.h,v 1.2 2005/12/11 12:17:24 christos Exp $	*/
+/*	$NetBSD: harmonyreg.h,v 1.3 2008/09/23 14:07:11 mjf Exp $	*/
 /*	$OpenBSD: harmonyreg.h,v 1.5 2003/06/02 19:54:29 jason Exp $	*/
 /*
  * Copyright (c) 2003 Jason L. Wright (jason@thought.net)
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -118,27 +118,27 @@
 #define	GAINCTL_MONITOR_M	0x00f00000	/* monitor gain (inverted) */
 #define	GAINCTL_MONITOR_S	20
 #define	GAINCTL_MONITOR_BITS	4
 #define	GAINCTL_OUTPUT_LEFT_M	0x00000fc0	/* left out gain (inverted) */
 #define	GAINCTL_OUTPUT_LEFT_S	6
 #define	GAINCTL_OUTPUT_RIGHT_M	0x0000003f	/* right out gain (inverted) */
 #define	GAINCTL_OUTPUT_RIGHT_S	0
 #define	GAINCTL_OUTPUT_BITS	6
 /* HARMONY_PCURADD */
 #define	PCURADD_BUFMASK		(~(HARMONY_BUFSIZE - 1))
 /* HARMONY_RCURADD */
-#define	PCURADD_BUFMASK		(~(HARMONY_BUFSIZE - 1))
+#define	RCURADD_BUFMASK		(~(HARMONY_BUFSIZE - 1))
 /* HARMONY_DSTATUS */
 #define	DSTATUS_IE		0x80000000	/* interrupt enable */
 #define	DSTATUS_PN		0x00000200	/* playback next empty */
 #define	DSTATUS_PC		0x00000100	/* playback dma active */
 #define	DSTATUS_RN		0x00000002	/* record next empty */
 #define	DSTATUS_RC		0x00000001	/* record dma active */
 /* HARMONY_OV */
 #define	OV_OV			0x00000001	/* input over range */
 /* HARMONY_PIO */
 #define	PIO_PO			0x00000002	/* parallel output */