diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
| commit | 86464aed71025541805e7b1515541aee89879e33 (patch) | |
| tree | e01a457a4912a8553bc65524aa3125d51f29f810 /include/linux/wavefront.h | |
| parent | 88f99939ecc6a95a79614574cb7d95ffccfc3466 (diff) | |
Merge with Linux 2.2.1.
Diffstat (limited to 'include/linux/wavefront.h')
| -rw-r--r-- | include/linux/wavefront.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/include/linux/wavefront.h b/include/linux/wavefront.h index f5f4052d6..f96c52d04 100644 --- a/include/linux/wavefront.h +++ b/include/linux/wavefront.h @@ -307,7 +307,7 @@ struct wf_layer UCHAR8 mute:1; UCHAR8 split_point:7; - UCHAR8 updown:1; + UCHAR8 play_below:1; UCHAR8 pan_mod_src:2; UCHAR8 pan_or_mod:1; @@ -507,9 +507,16 @@ typedef union wf_any { typedef struct wf_patch_info { + /* the first two fields are used by the OSS "patch loading" interface + only, and are unused by the current user-level library. + */ + INT16 key; /* Use WAVEFRONT_PATCH here */ UINT16 devno; /* fill in when sending */ UCHAR8 subkey; /* WF_ST_{SAMPLE,ALIAS,etc.} */ + +#define WAVEFRONT_FIND_FREE_SAMPLE_SLOT 999 + UINT16 number; /* patch/sample/prog number */ UINT32 size; /* size of any data included in @@ -548,13 +555,15 @@ typedef struct wf_patch_info { */ typedef struct wavefront_control { - int devno; /* from /dev/sequencer interface */ int cmd; /* WFC_* */ char status; /* return status to user-space */ unsigned char rbuf[WF_MAX_READ]; /* bytes read from card */ unsigned char wbuf[WF_MAX_WRITE]; /* bytes written to card */ } wavefront_control; +#define WFCTL_WFCMD 0x1 +#define WFCTL_LOAD_SPP 0x2 + /* Modulator table */ #define WF_MOD_LFO1 0 |