aboutsummaryrefslogtreecommitdiffstats
path: root/include/sound/emu10k1.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/sound/emu10k1.h')
-rw-r--r--include/sound/emu10k1.h11
1 files changed, 7 insertions, 4 deletions
diff --git a/include/sound/emu10k1.h b/include/sound/emu10k1.h
index 10ee28eac018..6a664c3f7c1e 100644
--- a/include/sound/emu10k1.h
+++ b/include/sound/emu10k1.h
@@ -1,6 +1,8 @@
1#ifndef __SOUND_EMU10K1_H 1#ifndef __SOUND_EMU10K1_H
2#define __SOUND_EMU10K1_H 2#define __SOUND_EMU10K1_H
3 3
4#include <linux/types.h>
5
4/* 6/*
5 * Copyright (c) by Jaroslav Kysela <perex@perex.cz>, 7 * Copyright (c) by Jaroslav Kysela <perex@perex.cz>,
6 * Creative Labs, Inc. 8 * Creative Labs, Inc.
@@ -34,6 +36,7 @@
34#include <sound/timer.h> 36#include <sound/timer.h>
35#include <linux/interrupt.h> 37#include <linux/interrupt.h>
36#include <linux/mutex.h> 38#include <linux/mutex.h>
39
37#include <asm/io.h> 40#include <asm/io.h>
38 41
39/* ------------------- DEFINES -------------------- */ 42/* ------------------- DEFINES -------------------- */
@@ -2171,7 +2174,7 @@ struct snd_emu10k1_fx8010_code {
2171 char name[128]; 2174 char name[128];
2172 2175
2173 DECLARE_BITMAP(gpr_valid, 0x200); /* bitmask of valid initializers */ 2176 DECLARE_BITMAP(gpr_valid, 0x200); /* bitmask of valid initializers */
2174 u_int32_t __user *gpr_map; /* initializers */ 2177 __u32 __user *gpr_map; /* initializers */
2175 2178
2176 unsigned int gpr_add_control_count; /* count of GPR controls to add/replace */ 2179 unsigned int gpr_add_control_count; /* count of GPR controls to add/replace */
2177 struct snd_emu10k1_fx8010_control_gpr __user *gpr_add_controls; /* GPR controls to add/replace */ 2180 struct snd_emu10k1_fx8010_control_gpr __user *gpr_add_controls; /* GPR controls to add/replace */
@@ -2184,11 +2187,11 @@ struct snd_emu10k1_fx8010_code {
2184 struct snd_emu10k1_fx8010_control_gpr __user *gpr_list_controls; /* listed GPR controls */ 2187 struct snd_emu10k1_fx8010_control_gpr __user *gpr_list_controls; /* listed GPR controls */
2185 2188
2186 DECLARE_BITMAP(tram_valid, 0x100); /* bitmask of valid initializers */ 2189 DECLARE_BITMAP(tram_valid, 0x100); /* bitmask of valid initializers */
2187 u_int32_t __user *tram_data_map; /* data initializers */ 2190 __u32 __user *tram_data_map; /* data initializers */
2188 u_int32_t __user *tram_addr_map; /* map initializers */ 2191 __u32 __user *tram_addr_map; /* map initializers */
2189 2192
2190 DECLARE_BITMAP(code_valid, 1024); /* bitmask of valid instructions */ 2193 DECLARE_BITMAP(code_valid, 1024); /* bitmask of valid instructions */
2191 u_int32_t __user *code; /* one instruction - 64 bits */ 2194 __u32 __user *code; /* one instruction - 64 bits */
2192}; 2195};
2193 2196
2194struct snd_emu10k1_fx8010_tram { 2197struct snd_emu10k1_fx8010_tram {