[alsa-devel] [PATCH 0/2] hdsploader/hdspmixer: Fix RPM constant
As noticed by Takashi, the RPM constant needs to be 4, not 5. For hdspmixer, this doesn't matter, for hdsploader, it's essential.
Adrian Knoth (2): hdsploader: Fix temporary RPM constant hdspmixer: Fix temporary RPM constant
hdsploader/hdsploader.c | 2 +- hdspmixer/src/HDSPMixerCard.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
RPM in HDSP_IO_Type (enum from hdsp.h) is 4, not 5.
Signed-off-by: Adrian Knoth adi@drcomp.erfurt.thur.de
diff --git a/hdsploader/hdsploader.c b/hdsploader/hdsploader.c index bfbe3bc..9199c3a 100644 --- a/hdsploader/hdsploader.c +++ b/hdsploader/hdsploader.c @@ -28,7 +28,7 @@ static u_int32_t code[24413];
#ifndef RPM -# define RPM 5 +# define RPM 4 #endif
int read_bin_file(u_int32_t *array, const char *filename)
RPM in hdsp.h's HDSP_IO_Type is 4, not 5. This patch isn't exactly necessary here, because the constant is only used internally, but to avoid confusion if somebody ever reads the code, let's use the correct value.
Note that we'll drop it after the next alsa-lib release.
Signed-off-by: Adrian Knoth adi@drcomp.erfurt.thur.de
diff --git a/hdspmixer/src/HDSPMixerCard.h b/hdspmixer/src/HDSPMixerCard.h index 656702b..faaeefa 100644 --- a/hdspmixer/src/HDSPMixerCard.h +++ b/hdspmixer/src/HDSPMixerCard.h @@ -34,7 +34,7 @@
/* temporary workaround until hdsp.h (HDSP_IO_Type gets fixed */ #ifndef RPM -# define RPM 5 +# define RPM 4 #endif
class HDSPMixerWindow;
At Fri, 29 Jul 2011 17:57:28 +0200, Adrian Knoth wrote:
As noticed by Takashi, the RPM constant needs to be 4, not 5. For hdspmixer, this doesn't matter, for hdsploader, it's essential.
Applied both now. Thanks.
Takashi
Adrian Knoth (2): hdsploader: Fix temporary RPM constant hdspmixer: Fix temporary RPM constant
hdsploader/hdsploader.c | 2 +- hdspmixer/src/HDSPMixerCard.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
-- 1.7.5.4
participants (2)
-
Adrian Knoth -
Takashi Iwai