From b90b0f96a4102325d2ac270634c00a4392a26197 Mon Sep 17 00:00:00 2001 From: Nicolas Kaiser Date: Mon, 12 Nov 2007 12:25:02 +0100 Subject: [PATCH] --- yaml --- r: 81486 b: refs/heads/master c: 27caac81f33c85bfc745c75a8bc1f8107077ef56 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/pci/korg1212/korg1212.c | 3 --- trunk/sound/pci/rme9652/hdsp.c | 2 -- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index b0e74b410c0a..8ac67ef7748b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5dbc94791005608c57674fba04dd6b5e19ba9342 +refs/heads/master: 27caac81f33c85bfc745c75a8bc1f8107077ef56 diff --git a/trunk/sound/pci/korg1212/korg1212.c b/trunk/sound/pci/korg1212/korg1212.c index c4af57fb5af1..f47172ff79b3 100644 --- a/trunk/sound/pci/korg1212/korg1212.c +++ b/trunk/sound/pci/korg1212/korg1212.c @@ -163,9 +163,6 @@ enum MonitorModeSelector { // this is the upper word of the PCI control reg. #define DEV_VEND_ID_OFFSET 0x70 // location of the device and vendor ID register -#define COMMAND_ACK_DELAY 13 // number of RTC ticks to wait for an acknowledgement - // from the card after sending a command. -#define INTERCOMMAND_DELAY 40 #define MAX_COMMAND_RETRIES 5 // maximum number of times the driver will attempt // to send a command before giving up. #define COMMAND_ACK_MASK 0x8000 // the MSB is set in the command acknowledgment from diff --git a/trunk/sound/pci/rme9652/hdsp.c b/trunk/sound/pci/rme9652/hdsp.c index ff26a3672d40..5aa57aef1fa7 100644 --- a/trunk/sound/pci/rme9652/hdsp.c +++ b/trunk/sound/pci/rme9652/hdsp.c @@ -104,8 +104,6 @@ MODULE_FIRMWARE("digiface_firmware_rev11.bin"); #define HDSP_statusRegister 0 #define HDSP_timecode 128 #define HDSP_status2Register 192 -#define HDSP_midiDataOut0 352 -#define HDSP_midiDataOut1 356 #define HDSP_midiDataIn0 360 #define HDSP_midiDataIn1 364 #define HDSP_midiStatusOut0 384