git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
include
/
sound
/
hdsp.h
diff --git
a/include/sound/hdsp.h
b/include/sound/hdsp.h
index
21a9f1c
..
7ce3aa6
100644
(file)
--- a/
include/sound/hdsp.h
+++ b/
include/sound/hdsp.h
@@
-32,13
+32,13
@@
typedef enum {
typedef struct _snd_hdsp_peak_rms hdsp_peak_rms_t;
struct _snd_hdsp_peak_rms {
typedef struct _snd_hdsp_peak_rms hdsp_peak_rms_t;
struct _snd_hdsp_peak_rms {
- u
nsigned int
input_peaks[26];
- u
nsigned int
playback_peaks[26];
- u
nsigned int
output_peaks[28];
- u
nsigned long long
input_rms[26];
- u
nsigned long long
playback_rms[26];
+ u
32
input_peaks[26];
+ u
32
playback_peaks[26];
+ u
32
output_peaks[28];
+ u
64
input_rms[26];
+ u
64
playback_rms[26];
/* These are only used for H96xx cards */
/* These are only used for H96xx cards */
- u
nsigned long long
output_rms[26];
+ u
64
output_rms[26];
};
#define SNDRV_HDSP_IOCTL_GET_PEAK_RMS _IOR('H', 0x40, hdsp_peak_rms_t)
};
#define SNDRV_HDSP_IOCTL_GET_PEAK_RMS _IOR('H', 0x40, hdsp_peak_rms_t)
@@
-76,7
+76,7
@@
struct _snd_hdsp_config_info {
typedef struct _snd_hdsp_firmware hdsp_firmware_t;
struct _snd_hdsp_firmware {
typedef struct _snd_hdsp_firmware hdsp_firmware_t;
struct _snd_hdsp_firmware {
-
unsigned long *firmware_data; /* 24413 long word
s */
+
void __user *firmware_data; /* 24413 x 4 byte
s */
};
#define SNDRV_HDSP_IOCTL_UPLOAD_FIRMWARE _IOW('H', 0x42, hdsp_firmware_t)
};
#define SNDRV_HDSP_IOCTL_UPLOAD_FIRMWARE _IOW('H', 0x42, hdsp_firmware_t)