audio type 2 is called harmony and could come w/ 2 fax/modem/voice channels, or isdn

diff --git a/sys/arch/hppa/conf/GECKO b/sys/arch/hppa/conf/GECKO
index 92d0ca6..cf4003a 100644 (file)
--- a/sys/arch/hppa/conf/GECKO
+++ b/sys/arch/hppa/conf/GECKO
@@ -1,4 +1,4 @@
-#      $OpenBSD: GECKO,v 1.7 1999/12/05 02:27:01 mickey Exp $
+#      $OpenBSD: GECKO,v 1.8 2000/04/18 19:30:59 mickey Exp $
 #
 # HP 9000/712/{60,80,80i,100} boxens
 #
@@ -42,10 +42,10 @@ ie0 at gsc? irq 8   # 82C596 ether
 #ie1   at gsc? irq 10? # 82C596 ether (add-in card)
 siop0  at gsc? irq 9   # NCR 53C710
 scsibus* at siop?
-#atwo* at gsc? irq 13  # Audio Type 2 (CS4215)
-#audio*        at atwo?
-#phone0        at gsc? irq 16  # Telephone add-in card #0
-#phone1        at gsc? irq 17  # Telephone add-in card #1
+#harmony*      at gsc? irq 13  # Audio Type 2 (CS4215)
+#audio*        at harmony?
+#com0  at harmony? irq 16      # Telephone add-in card #0
+#com1  at harmony? irq 17      # Telephone add-in card #1
 #isdn  at gsc? irq 18  # ISDN add-in card
 #SCSI Snoop irq 19
 fdc0   at gsc? irq 20  # PC floppy controller (WD37C65C)

diff --git a/sys/arch/hppa/conf/SHEPHERD_PIE b/sys/arch/hppa/conf/SHEPHERD_PIE
index 4c47d1e..5914e19 100644 (file)
--- a/sys/arch/hppa/conf/SHEPHERD_PIE
+++ b/sys/arch/hppa/conf/SHEPHERD_PIE
@@ -1,4 +1,4 @@
-#      $OpenBSD: SHEPHERD_PIE,v 1.7 1999/12/05 02:31:40 mickey Exp $
+#      $OpenBSD: SHEPHERD_PIE,v 1.8 2000/04/18 19:31:00 mickey Exp $
 #
 # Diskless kernel config
 #
@@ -119,8 +119,8 @@ ie0 at gsc? irq 8   # 82C5[89]6 ether
 #scsibus* at siop?
 #aone* at gsc? irq 13  # Audio Type 1 (PSB 2160-N)
 #audio* at aone?
-#atwo* at gsc? irq 13  # Audio Type 2 (CS4215)
-#audio* at atwo?
+#harmony*      at gsc? irq 13  # Audio Type 2 (CS4215)
+#audio* at harmony?
 #pckbc*        at gsc? irq 26
 #pckbd*        at pckbc?       # PS/2 keyboard
 #pms*  at pckbc?       # PS/2 mouse

diff --git a/sys/arch/hppa/conf/files.hppa b/sys/arch/hppa/conf/files.hppa
index 5a7509e..4fbaf6b 100644 (file)
--- a/sys/arch/hppa/conf/files.hppa
+++ b/sys/arch/hppa/conf/files.hppa
@@ -1,4 +1,4 @@
-#      $OpenBSD: files.hppa,v 1.21 2000/01/11 21:26:24 mickey Exp $
+#      $OpenBSD: files.hppa,v 1.22 2000/04/18 19:31:00 mickey Exp $
 #
 # hppa-specific configuration info
 
@@ -150,10 +150,15 @@ device    aone: audio, mulaw, auconv
 attach aone at gsc
 file   arch/hppa/gsc/aone.c            aone
 
-# CS4215 based 16bit mono/stereo audio iface (most of others not w/ aone)
-device atwo: audio, mulaw, auconv
-attach atwo at gsc
-file   arch/hppa/gsc/atwo.c            atwo
+# CS4215/AD1849 based 16bit mono/stereo audio iface (most of others not w/ aone)
+# a.k.a. Audio Type 2 (optional beeper)
+device harmony {} : audio, mulaw, auconv
+attach harmony at gsc
+file   arch/hppa/gsc/harmony.c         harmony
+
+# fax/modem/voice on harmony
+attach com at harmony with com_harmony
+fle    arch/hppa/gsc/com_harmony.c     com_harmony
 
 # HPA4011A/B w/ TMS380C26PQL, TMS38054FNL
 #device        tms: tokenring

diff --git a/sys/arch/hppa/conf/generic.hppa b/sys/arch/hppa/conf/generic.hppa
index 8145700..10efd24 100644 (file)
--- a/sys/arch/hppa/conf/generic.hppa
+++ b/sys/arch/hppa/conf/generic.hppa
@@ -1,4 +1,4 @@
-#      $OpenBSD: generic.hppa,v 1.2 1999/06/23 01:57:53 mickey Exp $
+#      $OpenBSD: generic.hppa,v 1.3 2000/04/18 19:31:00 mickey Exp $
 #
 # Generic kernel config (all that is supportted)
 #
@@ -62,8 +62,8 @@ siop1 at gsc? irq 3   # NCR 53C7xx (Fast/Wide)
 scsibus* at siop?
 #aone* at gsc? irq 13  # Audio Type 1 (PSB 2160-N)
 #audio* at aone?
-#atwo* at gsc? irq 13  # Audio Type 2 (CS4215)
-#audio* at atwo?
+#harmony*      at harmony?     irq 13  # Audio Type 2 (CS4215)
+#audio* at harmony?
 #fdc*  at gsc? irq 20  # PC floppy controller (WD37C65C)
 #option        FD_DEBUG
 pckbc* at gsc? irq 26