On Wed, 2009-02-04 at 13:51 +0100, Arnd Bergmann wrote:
> ---
> This patch breaks building against OSSlib with the kernel headers
> instead of its own headers. It should still work with any
> version of the library from the 2003 onwards which provide
> their own headers for the latest interface.
>
> Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
>
> --- a/include/linux/soundcard.h
> +++ b/include/linux/soundcard.h
> @@ -1045,7 +1045,7 @@ typedef struct mixer_vol_table {
> */
> #define LOCL_STARTAUDIO 1
>
> -#if (!defined(__KERNEL__) && !defined(KERNEL) && !defined(INKERNEL) && !defined(_KERNEL)) || defined(USE_SEQ_MACROS)
> +#if !defined(__KERNEL__) || defined(USE_SEQ_MACROS)
> /*
> * Some convenience macros to simplify programming of the
> * /dev/sequencer interface
> @@ -1056,39 +1056,15 @@ typedef struct mixer_vol_table {
>
> void seqbuf_dump(void); /* This function must be provided by programs */
>
> -extern int OSS_init(int seqfd, int buflen);
> -extern void OSS_seqbuf_dump(int fd, unsigned char *buf, int buflen);
> -extern void OSS_seq_advbuf(int len, int fd, unsigned char *buf, int buflen);
> -extern void OSS_seq_needbuf(int len, int fd, unsigned char *buf, int buflen);
> -extern void OSS_patch_caching(int dev, int chn, int patch,
> - int fd, unsigned char *buf, int buflen);
> -extern void OSS_drum_caching(int dev, int chn, int patch,
> - int fd, unsigned char *buf, int buflen);
> -extern void OSS_write_patch(int fd, unsigned char *buf, int len);
> -extern int OSS_write_patch2(int fd, unsigned char *buf, int len);
> -
> #define SEQ_PM_DEFINES int __foo_bar___
> -#ifdef OSSLIB
> -# define SEQ_USE_EXTBUF() \
> - extern unsigned char *_seqbuf; \
> - extern int _seqbuflen;extern int _seqbufptr
> -# define SEQ_DEFINEBUF(len) SEQ_USE_EXTBUF();static int _requested_seqbuflen=len
> -# define _SEQ_ADVBUF(len) OSS_seq_advbuf(len, seqfd, _seqbuf, _seqbuflen)
> -# define _SEQ_NEEDBUF(len) OSS_seq_needbuf(len, seqfd, _seqbuf, _seqbuflen)
> -# define SEQ_DUMPBUF() OSS_seqbuf_dump(seqfd, _seqbuf, _seqbuflen)
> -
> -# define SEQ_LOAD_GMINSTR(dev, instr) \
> - OSS_patch_caching(dev, -1, instr, seqfd, _seqbuf, _seqbuflen)
> -# define SEQ_LOAD_GMDRUM(dev, drum) \
> - OSS_drum_caching(dev, -1, drum, seqfd, _seqbuf, _seqbuflen)
> -#else /* !OSSLIB */
> -
> -# define SEQ_LOAD_GMINSTR(dev, instr)
> -# define SEQ_LOAD_GMDRUM(dev, drum)
> -
> -# define SEQ_USE_EXTBUF() \
> - extern unsigned char _seqbuf[]; \
> - extern int _seqbuflen;extern int _seqbufptr
> +
> +#define SEQ_LOAD_GMINSTR(dev, instr)
> +#define SEQ_LOAD_GMDRUM(dev, drum)
> +
> +#define _SEQ_EXTERN extern
> +#define SEQ_USE_EXTBUF() \
> + _SEQ_EXTERN unsigned char _seqbuf[]; \
> + _SEQ_EXTERN int _seqbuflen;_SEQ_EXTERN int _seqbufptr
hmm, you rename snake as rope, but actually snake is still there ;-)
--
JSR
_______________________________________________
Alsa-devel mailing list
Alsa-devel@xxxxxxxxxxxxxxxx
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
