summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorTed Unangst <tedu@cvs.openbsd.org>2013-04-05 07:25:27 +0000
committerTed Unangst <tedu@cvs.openbsd.org>2013-04-05 07:25:27 +0000
commit01e270952b7426a92767b0d570dc4018a984162a (patch)
tree39b560d1c8dae1a83e15e47643a3ddfc319e1616 /sys/dev
parente9854ae35b453274b26baf0f7889096dfab0c94c (diff)
unfinished opti device code is never called or used
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/isa/files.isa6
-rw-r--r--sys/dev/isa/opti.c336
-rw-r--r--sys/dev/isa/opti.h71
3 files changed, 2 insertions, 411 deletions
diff --git a/sys/dev/isa/files.isa b/sys/dev/isa/files.isa
index bbc475d949d..9792a41c117 100644
--- a/sys/dev/isa/files.isa
+++ b/sys/dev/isa/files.isa
@@ -1,4 +1,4 @@
-# $OpenBSD: files.isa,v 1.111 2011/06/29 17:48:22 tedu Exp $
+# $OpenBSD: files.isa,v 1.112 2013/04/05 07:25:26 tedu Exp $
# $NetBSD: files.isa,v 1.21 1996/05/16 03:45:55 mycroft Exp $
#
# Config file and device description for machine-independent ISA code.
@@ -115,8 +115,6 @@ attach wds at isa
file dev/isa/wds.c wds
# OPTi 82C929 chipset setup code
-define opti
-file dev/isa/opti.c opti
#
# Other ISA disk controllers
@@ -214,7 +212,7 @@ define sbdsp {}
file dev/isa/sbdsp.c sbdsp
# SoundBlaster family
-device sb: audio, isa_dma, sbdsp, mulaw, opti, auconv, mpu, midibus
+device sb: audio, isa_dma, sbdsp, mulaw, auconv, mpu, midibus
file dev/isa/sb.c sb needs-flag
attach sb at isa with sb_isa
diff --git a/sys/dev/isa/opti.c b/sys/dev/isa/opti.c
deleted file mode 100644
index 8211dd9e806..00000000000
--- a/sys/dev/isa/opti.c
+++ /dev/null
@@ -1,336 +0,0 @@
-/* $OpenBSD: opti.c,v 1.9 2011/06/23 16:31:16 deraadt Exp $ */
-
-/*
- * Copyright (c) 1996 Michael Shalayeff
- * 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
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-
-/*
- * Code to setup 82C929 chipset
- */
-
-/* #define OPTI_DEBUG 9 */
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/kernel.h>
-#include <sys/conf.h>
-#include <sys/device.h>
-
-#include <machine/pio.h>
-
-#include <dev/isa/isavar.h>
-
-#include <dev/isa/opti.h>
-
-#ifdef OPTI_DEBUG
- int opti_debuglevel = OPTI_DEBUG;
-# define XDEBUG(level, data) ((opti_debuglevel >= level)? printf data:0)
-#else
-# define XDEBUG(level, data) /* ((opti_debuglevel >= level)? printf data:0) */
-#endif
-
-int opti_type = OPTI_C929; /* XXX only one card can be installed */
-
-#define OPTI_cd_valid_ift(i) ((i)==OPTI_SONY||(i)==OPTI_PANASONIC||\
- (i)==OPTI_MITSUMI||(i)==OPTI_IDE)
-
-static __inline int OPTI_cd_addr(int);
-static __inline int OPTI_cd_irq(int);
-static __inline int OPTI_cd_drq(int);
-static __inline int OPTI_snd_addr(int);
-static __inline int OPTI_snd_irq(int);
-static __inline int OPTI_snd_drq(int);
-static __inline void opti_outb(u_short, u_char);
-static __inline u_char opti_inb(u_short);
-static int opti_present(void);
-
-static __inline int
-OPTI_cd_addr(a)
- int a;
-{
- switch(a) {
- case 0x320:
- return 0xc0;
- case 0x330:
- return 0x40;
- case 0x340:
- return 0x00;
- case 0x360:
- return 0x80;
- default:
- return -1;
- }
-}
-
-static __inline int
-OPTI_cd_irq(i)
- int i;
-{
- switch(i) {
- case 5:
- return 0x04;
- case 7:
- return 0x08;
- case 3:
- return 0x0c;
- case 9:
- return 0x10;
- case 10:
- return 0x14;
- case 11:
- return 0x18;
- case -1:
- return 0x00;
- default:
- return -1;
- }
-}
-
-static __inline int
-OPTI_cd_drq(d)
- int d;
-{
- switch(d) {
- case 3:
- case 5:
- return 0;
- case 6:
- return 1;
- case 7:
- return 2;
- default:
- return 3;
- }
-}
-
-#define OPTI_snd_valid_ift(i) ((i)==OPTI_WSS||(i)==OPTI_SB)
-
-static __inline int
-OPTI_snd_addr(a)
- int a;
-{
- switch(a) {
- case 0x220:
- return 0x0;
- case 0x240:
- return 0x3;
- case 0x530:
- return 0x8;
- case 0xE80:
- return 0x9;
- case 0xF40:
- return 0xa;
- case 0x604:
- return 0xb;
- default:
- return -1;
- }
-}
-
-static __inline int
-OPTI_snd_irq(i)
- int i;
-{
- switch(i) {
- case 5:
- return 0x04;
- case 7:
- return 0x08;
- case 3:
- return 0x0c;
- case 9:
- return 0x10;
- case 10:
- return 0x14;
- case 11:
- return 0x18;
- case -1:
- return 0x00;
- default:
- return -1;
- }
-}
-
-static __inline int
-OPTI_snd_drq(d)
- int d;
-{
- switch(d) {
- case 3:
- case 5:
- return 0;
- case 6:
- return 1;
- case 7:
- return 2;
- default:
- return 3;
- }
-}
-
-static __inline void
-opti_outb(port, byte)
- u_short port;
- u_char byte;
-{
- outb( OPTI_PASSWD, opti_type );
- outb( port, byte );
-}
-
-static __inline u_char
-opti_inb(port)
- u_short port;
-{
- outb( OPTI_PASSWD, opti_type );
- return inb( port );
-}
-
-static int
-opti_present(void)
-{
- register u_char a, b;
- int s = splhigh();
-
- a = opti_inb( OPTI_PASSWD );
- opti_outb( OPTI_PASSWD, 0x00 );
- b = opti_inb( OPTI_PASSWD );
- opti_outb( OPTI_PASSWD, a );
-
- if (b != 2) {
- opti_type = OPTI_C928;
-
- a = opti_inb( OPTI_PASSWD );
- opti_outb( OPTI_PASSWD, 0x00 );
- b = opti_inb( OPTI_PASSWD );
- opti_outb( OPTI_PASSWD, a );
- }
-
- splx(s);
-
- return b == 2;
-}
-
-int
-opti_cd_setup(ift, addr, irq, drq)
- int ift, addr, irq, drq;
-{
- int ret = 0;
-
- XDEBUG( 2, ("opti: do CD setup type=%u, addr=0x%x, irq=%d, drq=%d\n",
- ift, addr, irq, drq));
-
- if( !opti_present() )
- XDEBUG( 2, ("opti: not present.\n"));
- else if( !OPTI_cd_valid_ift(ift) )
- XDEBUG( 2, ("opti: invalid CD-ROM interface type.\n"));
- else if( OPTI_cd_addr(addr) == -1)
- XDEBUG( 2, ("opti: illegal CD-ROM interface address.\n"));
- else if( OPTI_cd_irq(irq) == -1)
- XDEBUG( 2, ("opti: wrong CD-ROM irq number.\n"));
- else if( OPTI_cd_drq(drq) == -1)
- XDEBUG( 2, ("opti: bad CD_ROM drq number.\n"));
- else {
- /* so the setup */
- int s = splhigh();
- register u_char a, b;
-
- /* set interface type */
- a = opti_inb( OPTI_IFTP );
- b = (opti_inb( OPTI_DATA ) & 0x20) | 3 ;
- opti_outb( OPTI_DATA, b );
- opti_outb( OPTI_IFTP, (a & OPTI_SND_MASK) | 2 * ift );
- opti_outb( OPTI_ENBL, 0x80 );
-
- /* we don't need any additional setup for IDE CD-ROM */
- if( ift != OPTI_IDE )
- {
- /* set address */
- a = opti_inb( OPTI_DATA );
- opti_outb( OPTI_DATA, (a & 0x3f) |
- (0x40 * OPTI_cd_addr(addr)) );
-
- /* set irq */
- if( irq != IRQUNK )
- {
- a = opti_inb( OPTI_DATA );
- opti_outb( OPTI_DATA,
- (inb( OPTI_DATA ) & 0xe3) |
- OPTI_cd_irq(irq) );
- }
-
- /* set drq */
- if( drq != DRQUNK )
- {
- a = opti_inb( OPTI_DATA );
- opti_outb( OPTI_DATA,
- (inb( OPTI_DATA ) & 0xfc) |
- OPTI_cd_drq(drq) );
- }
- }
- splx(s);
- DELAY(1000);
- ret = 1;
- }
-
- return ret;
-}
-
-int
-opti_snd_setup(ift, addr, irq, drq)
- int ift, addr, irq, drq;
-{
- XDEBUG( 2, ("opti: do SND setup type=%u,addr=%x,irq=%d,drq=%d\n",
- ift, addr, irq, drq));
-
- if( !opti_present() )
- XDEBUG( 2, ("opti: not present.\n"));
- else if( !OPTI_snd_valid_ift(ift) )
- XDEBUG( 2, ("opti: invalid SND interface type.\n"));
- else if( OPTI_snd_addr(addr) == -1)
- XDEBUG( 2, ("opti: illegal SND interface address.\n"));
- else if( OPTI_snd_irq(irq) == -1)
- XDEBUG( 2, ("opti: wrong SND irq number.\n"));
- else if( OPTI_snd_drq(drq) == -1)
- XDEBUG( 2, ("opti: bad SND drq number.\n"));
- else {
- /* so the setup */
- int s = splhigh();
- register u_char a;
-
- if (ift == OPTI_WSS) {
- a = opti_inb(OPTI_IFTP);
- opti_outb(OPTI_IFTP, ((a & ~OPTI_SND_MASK)
- | (OPTI_snd_addr(addr)*16)) + 1);
- opti_outb(OPTI_ENBL, 0x1a);
- }
-
- splx(s);
- DELAY(1000);
- return 1;
- }
-
- return 0;
-}
diff --git a/sys/dev/isa/opti.h b/sys/dev/isa/opti.h
deleted file mode 100644
index 50bc9d780c0..00000000000
--- a/sys/dev/isa/opti.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* $OpenBSD: opti.h,v 1.6 2003/06/02 19:24:22 mickey Exp $ */
-
-/*
- * Copyright (c) 1996 Michael Shalayeff
- * 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
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-
-#ifndef __OPTI_HEADER__
-#define __OPTI_HEADER__
-
- /* card types */
-
-#define OPTI_C928 0xe2
-#define OPTI_MOZART 0xe2
-#define OPTI_C929 0xe3
-#define OPTI_C930 0xe3 /* XXX 0xe4 ??? */
-
- /* i/o ports */
-
-#define OPTI_4 0xF84
-#define OPTI_5 0xF85
-#define OPTI_DATA 0xF8E
-#define OPTI_IFTP 0xF8D /* iface control register */
-#define OPTI_PASSWD 0xF8F
-#define OPTI_ENBL 0xF91
-
-#define OPTI_SND_MASK 0xf1
-
- /* CD-ROM iface setup */
-
- /* CD-ROM interface types */
-#define OPTI_DISABLE 0
-#define OPTI_SONY 1
-#define OPTI_MITSUMI 2
-#define OPTI_PANASONIC 3
-#define OPTI_IDE 4
-
- /* Sound system setup */
-
- /* Sound iface types */
-#define OPTI_WSS (0) /* Windows Sound System */
-#define OPTI_SB (1) /* Sound Blaster Pro(tm) compatible */
-
-#ifdef _KERNEL
-int opti_cd_setup( int, int, int, int );
-int opti_snd_setup( int, int, int, int );
-#endif
-
-#endif /* __OPTI_HEADER__ */