From da74fafce944e865ee9885118149217506a919d5 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Tue, 2 May 1995 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1995-05-02

---
 pc/dma.c  | 11 +++++++++++
 pc/fns.h  |  1 +
 pc/trap.c |  2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/pc/dma.c b/pc/dma.c
index 9a937b219d2104a5a36ab8924ae0f9570bdf3bbb..387ed3041dcc45d2f85a1bc7c1c034f6e8524950 100644
--- a/pc/dma.c
+++ b/pc/dma.c
@@ -162,6 +162,17 @@ dmasetup(int chan, void *va, long len, int isread)
 	return len;
 }
 
+int
+dmadone(int chan)
+{
+	DMA *dp;
+
+	dp = &dma[(chan>>2)&1];
+	chan = chan & 3;
+
+	return inb(dp->cmd) & (1<<chan);
+}
+
 /*
  *  this must be called after a dma has been completed.
  *
diff --git a/pc/fns.h b/pc/fns.h
index 03d6e8f389c3903722c6ca6dfed2a085ce966921..1aa84b66670e841988d43875ede706a0aa37a06b 100644
--- a/pc/fns.h
+++ b/pc/fns.h
@@ -12,6 +12,7 @@ void	clockinit(void);
 void	config(int);
 int	cpuspeed(int);
 void	delay(int);
+int	dmadone(int);
 void	dmaend(int);
 void	dmainit(void);
 long	dmasetup(int, void*, long, int);
diff --git a/pc/trap.c b/pc/trap.c
index 9f9c7bbcf9fbbc512caf435a58b2d6e06c105f3f..830f619999d4fc1073aa41e8943e8c3560671656 100644
--- a/pc/trap.c
+++ b/pc/trap.c
@@ -202,7 +202,7 @@ trapinit(void)
 	 *  Set the 8259 as master with level triggered
 	 *  input with fully nested interrupts.
 	 */
-	outb(Int1ctl, (1<<4)|(1<<3)|(1<<0));	/* ICW1 - master, level triggered,
+	outb(Int1ctl, (1<<4)|(0<<3)|(1<<0));	/* ICW1 - master, level triggered,
 					  	 ICW4 will be sent */
 	outb(Int1aux, Int1vec);		/* ICW2 - interrupt vector offset */
 	outb(Int1aux, 0x02);		/* ICW3 - I am a slave on level 2 */