aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorNicolas Kaiser <nikai@nikai.net>2007-11-12 06:25:02 -0500
committerJaroslav Kysela <perex@perex.cz>2008-01-31 11:29:21 -0500
commit27caac81f33c85bfc745c75a8bc1f8107077ef56 (patch)
treef069e6b15512d34832622f157c102f8178be100a /sound
parent5dbc94791005608c57674fba04dd6b5e19ba9342 (diff)
[ALSA] sound/pci: remove duplicated defines
Remove duplicated defines. (From their use it looks like 'midiDataOutx are written to rather than read from.) Signed-off-by: Nicolas Kaiser <nikai@nikai.net> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/korg1212/korg1212.c3
-rw-r--r--sound/pci/rme9652/hdsp.c2
2 files changed, 0 insertions, 5 deletions
diff --git a/sound/pci/korg1212/korg1212.c b/sound/pci/korg1212/korg1212.c
index c4af57fb5af1..f47172ff79b3 100644
--- a/sound/pci/korg1212/korg1212.c
+++ b/sound/pci/korg1212/korg1212.c
@@ -163,9 +163,6 @@ enum MonitorModeSelector {
163 // this is the upper word of the PCI control reg. 163 // this is the upper word of the PCI control reg.
164#define DEV_VEND_ID_OFFSET 0x70 // location of the device and vendor ID register 164#define DEV_VEND_ID_OFFSET 0x70 // location of the device and vendor ID register
165 165
166#define COMMAND_ACK_DELAY 13 // number of RTC ticks to wait for an acknowledgement
167 // from the card after sending a command.
168#define INTERCOMMAND_DELAY 40
169#define MAX_COMMAND_RETRIES 5 // maximum number of times the driver will attempt 166#define MAX_COMMAND_RETRIES 5 // maximum number of times the driver will attempt
170 // to send a command before giving up. 167 // to send a command before giving up.
171#define COMMAND_ACK_MASK 0x8000 // the MSB is set in the command acknowledgment from 168#define COMMAND_ACK_MASK 0x8000 // the MSB is set in the command acknowledgment from
diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c
index ff26a3672d40..5aa57aef1fa7 100644
--- a/sound/pci/rme9652/hdsp.c
+++ b/sound/pci/rme9652/hdsp.c
@@ -104,8 +104,6 @@ MODULE_FIRMWARE("digiface_firmware_rev11.bin");
104#define HDSP_statusRegister 0 104#define HDSP_statusRegister 0
105#define HDSP_timecode 128 105#define HDSP_timecode 128
106#define HDSP_status2Register 192 106#define HDSP_status2Register 192
107#define HDSP_midiDataOut0 352
108#define HDSP_midiDataOut1 356
109#define HDSP_midiDataIn0 360 107#define HDSP_midiDataIn0 360
110#define HDSP_midiDataIn1 364 108#define HDSP_midiDataIn1 364
111#define HDSP_midiStatusOut0 384 109#define HDSP_midiStatusOut0 384