aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/ice1712/envy24ht.h
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2008-05-20 08:22:44 -0400
committerClemens Ladisch <clemens@ladisch.de>2008-05-20 08:22:44 -0400
commitaea3bfbcfb0453217c8da6cfdc1b2394d214bee5 (patch)
tree7bf1609d799d92cb37a4d30552f4646d0603574e /sound/pci/ice1712/envy24ht.h
parent33e5b22285f63ede858c00456f3ffbc2ea79d6cf (diff)
[ALSA] ice1724: fix MIDI
The VT1724 MIDI port is not MPU-401 compatible; remove the hacks that try to make the MPU-401 library work with it, and just use some simple device-specific code. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Tested-by: Pavel Hofman <pavel.hofman@insite.cz>
Diffstat (limited to 'sound/pci/ice1712/envy24ht.h')
-rw-r--r--sound/pci/ice1712/envy24ht.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/sound/pci/ice1712/envy24ht.h b/sound/pci/ice1712/envy24ht.h
index 43b9e3e858be..a0c5e009bb4a 100644
--- a/sound/pci/ice1712/envy24ht.h
+++ b/sound/pci/ice1712/envy24ht.h
@@ -93,9 +93,13 @@ enum {
93#define VT1724_REG_MPU_TXFIFO 0x0a /*byte ro. number of bytes in TX fifo*/ 93#define VT1724_REG_MPU_TXFIFO 0x0a /*byte ro. number of bytes in TX fifo*/
94#define VT1724_REG_MPU_RXFIFO 0x0b /*byte ro. number of bytes in RX fifo*/ 94#define VT1724_REG_MPU_RXFIFO 0x0b /*byte ro. number of bytes in RX fifo*/
95 95
96//are these 2 the wrong way around? they don't seem to be used yet anyway 96#define VT1724_REG_MPU_DATA 0x0c /* byte */
97#define VT1724_REG_MPU_CTRL 0x0c /* byte */ 97#define VT1724_REG_MPU_CTRL 0x0d /* byte */
98#define VT1724_REG_MPU_DATA 0x0d /* byte */ 98#define VT1724_MPU_UART 0x01
99#define VT1724_MPU_TX_EMPTY 0x02
100#define VT1724_MPU_TX_FULL 0x04
101#define VT1724_MPU_RX_EMPTY 0x08
102#define VT1724_MPU_RX_FULL 0x10
99 103
100#define VT1724_REG_MPU_FIFO_WM 0x0e /*byte set the high/low watermarks for RX/TX fifos*/ 104#define VT1724_REG_MPU_FIFO_WM 0x0e /*byte set the high/low watermarks for RX/TX fifos*/
101#define VT1724_MPU_RX_FIFO 0x20 //1=rx fifo watermark 0=tx fifo watermark 105#define VT1724_MPU_RX_FIFO 0x20 //1=rx fifo watermark 0=tx fifo watermark