Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

switch macppc to use the MI zstty driver. 

add macppc's ZS_TXDMA hooks there.
This commit is contained in:
chs 2005-12-27 17:20:54 +00:00
parent d9585f8d92
commit 6cb72218d4
3 changed files with 42 additions and 1626 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/arch/macppc/conf/files.macppc
View File

@ -1,4 +1,4 @@
# $NetBSD: files.macppc,v 1.68 2005/12/11 12:18:03 christos Exp $
# $NetBSD: files.macppc,v 1.69 2005/12/27 17:20:54 chs Exp $
#
# macppc-specific configuration info
@ -134,7 +134,7 @@ file arch/macppc/dev/zs_kgdb.c zsc & kgdb
device zstty: tty
attach zstty at zsc
file arch/macppc/dev/z8530tty.c zstty needs-flag
file dev/ic/z8530tty.c zstty needs-flag
device adb {}
attach adb at obio

1604
sys/arch/macppc/dev/z8530tty.c
View File

File diff suppressed because it is too large Load Diff

60
sys/dev/ic/z8530tty.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: z8530tty.c,v 1.101 2005/12/11 12:21:29 christos Exp $ */
/* $NetBSD: z8530tty.c,v 1.102 2005/12/27 17:20:54 chs Exp $ */
/*-
* Copyright (c) 1993, 1994, 1995, 1996, 1997, 1998, 1999
@ -137,7 +137,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: z8530tty.c,v 1.101 2005/12/11 12:21:29 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: z8530tty.c,v 1.102 2005/12/27 17:20:54 chs Exp $");
#include "opt_kgdb.h"
#include "opt_ntp.h"
@ -1026,7 +1026,8 @@ zsstart(tp)
{
struct zstty_softc *zst = device_lookup(&zstty_cd, ZSUNIT(tp->t_dev));
struct zs_chanstate *cs = zst->zst_cs;
int s;
u_char *tba;
int s, tbc;
s = spltty();
if (ISSET(tp->t_state, TS_BUSY | TS_TIMEOUT | TS_TTSTOP))
@ -1045,23 +1046,24 @@ zsstart(tp)
}
/* Grab the first contiguous region of buffer space. */
{
u_char *tba;
int tbc;
tba = tp->t_outq.c_cf;
tbc = ndqb(&tp->t_outq, 0);
tba = tp->t_outq.c_cf;
tbc = ndqb(&tp->t_outq, 0);
(void) splzs();
simple_lock(&cs->cs_lock);
zst->zst_tba = tba;
zst->zst_tbc = tbc;
}
(void) splzs();
simple_lock(&cs->cs_lock);
zst->zst_tba = tba;
zst->zst_tbc = tbc;
SET(tp->t_state, TS_BUSY);
zst->zst_tx_busy = 1;
#ifdef ZS_TXDMA
if (zst->zst_tbc > 1) {
zs_dma_setup(cs, zst->zst_tba, zst->zst_tbc);
goto out;
}
#endif
/* Enable transmit completion interrupts if necessary. */
if (!ISSET(cs->cs_preg[1], ZSWR1_TIE)) {
SET(cs->cs_preg[1], ZSWR1_TIE);
@ -1070,11 +1072,10 @@ zsstart(tp)
}
/* Output the first character of the contiguous buffer. */
{
zs_write_data(cs, *zst->zst_tba);
zst->zst_tbc--;
zst->zst_tba++;
}
zs_write_data(cs, *zst->zst_tba);
zst->zst_tbc--;
zst->zst_tba++;
simple_unlock(&cs->cs_lock);
out:
splx(s);
@ -1942,3 +1943,22 @@ struct zsops zsops_tty = {
zstty_txint, /* xmit buffer empty */
zstty_softint, /* process software interrupt */
};
#ifdef ZS_TXDMA
void
zstty_txdma_int(arg)
void *arg;
{
struct zs_chanstate *cs = arg;
struct zstty_softc *zst = cs->cs_private;
zst->zst_tba += zst->zst_tbc;
zst->zst_tbc = 0;
if (zst->zst_tx_busy) {
zst->zst_tx_busy = 0;
zst->zst_tx_done = 1;
cs->cs_softreq = 1;
}
}
#endif