diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2008-12-09 12:30:13 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2008-12-09 12:30:13 +0000 |
| commit | f37bea7dfce6d1ee9563e6089f5f407d593badb2 (patch) | |
| tree | e6cab646b8e8c05beeb6e09b1aaa4a0edeebd8af /sys/dev/pci/emuxkivar.h | |
| parent | df02ea76399c97522432c823a7e52043efa2cfcb (diff) | |
Replace the sc_type/sc_details enum's in the softc struct with a sc_flags
flags field and use the flags as appropriate.
ok jakemsg@
Diffstat (limited to 'sys/dev/pci/emuxkivar.h')
| -rw-r--r-- | sys/dev/pci/emuxkivar.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/sys/dev/pci/emuxkivar.h b/sys/dev/pci/emuxkivar.h index 3deb95a6ab0..09626006e79 100644 --- a/sys/dev/pci/emuxkivar.h +++ b/sys/dev/pci/emuxkivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: emuxkivar.h,v 1.9 2008/10/29 22:39:44 jakemsr Exp $ */ +/* $OpenBSD: emuxkivar.h,v 1.10 2008/12/09 12:30:12 brad Exp $ */ /* $NetBSD: emuxkivar.h,v 1.1 2001/10/17 18:39:41 jdolecek Exp $ */ /*- @@ -220,13 +220,6 @@ struct emuxki_stream { struct emuxki_softc { struct device sc_dev; struct audio_device sc_audv; - enum { - EMUXKI_SBLIVE = 0x00, EMUXKI_AUDIGY = 0x01, EMUXKI_AUDIGY2 = 0x02, - EMUXKI_LIVE_5_1 = 0x04, EMUXKI_APS = 0x08 - } sc_type; - enum { - EMUXKI_CA0108_CHIP = 0x01, EMUXKI_CA0151_CHIP = 0x02 - } sc_details; /* Autoconfig parameters */ bus_space_tag_t sc_iot; @@ -257,6 +250,15 @@ struct emuxki_softc { struct device *sc_audev; struct emuxki_voice *pvoice, *rvoice, *lvoice; + + int sc_flags; +#define EMUXKI_SBLIVE 0x0001 +#define EMUXKI_AUDIGY 0x0002 +#define EMUXKI_AUDIGY2 0x0004 +#define EMUXKI_SBLIVE51 0x0008 +#define EMUXKI_APS 0x0010 +#define EMUXKI_CA0108 0x0020 +#define EMUXKI_CA0151 0x0040 }; #endif /* !_DEV_PCI_EMU10K1VAR_H_ */ |