Skip to content

L
linux-davinci
Commit 098ccbc5 authored by Krzysztof Helt's avatar Krzysztof Helt Committed by Jaroslav Kysela
Browse files
Options

[ALSA] dbri: driver cleanup 

This patch fixes white spaces, spelling and formatting
to conform closer to the coding standard of the kernel.
It contains few fixes pointed out by the checkpatch.pl script.
Signed-off-by: default avatarKrzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent 189609ae
Show whitespace changes
Inline Side-by-side
Showing with 208 additions and 182 deletions
sound/sparc/dbri.c
View file @ 098ccbc5
...@@ -8,18 +8,18 @@ ...@@ -8,18 +8,18 @@
* Copyright (C) 1997 Rudolf Koenig (rfkoenig@immd4.informatik.uni-erlangen.de) * Copyright (C) 1997 Rudolf Koenig (rfkoenig@immd4.informatik.uni-erlangen.de)
* Copyright (C) 1998, 1999 Brent Baccala (baccala@freesoft.org) * Copyright (C) 1998, 1999 Brent Baccala (baccala@freesoft.org)
* *
* This is the lowlevel driver for the DBRI & MMCODEC duo used for ISDN & AUDIO * This is the low level driver for the DBRI & MMCODEC duo used for ISDN & AUDIO
* on Sun SPARCstation 10, 20, LX and Voyager models. * on Sun SPARCStation 10, 20, LX and Voyager models.
* *
* - DBRI: AT&T T5900FX Dual Basic Rates ISDN Interface. It is a 32 channel * - DBRI: AT&T T5900FX Dual Basic Rates ISDN Interface. It is a 32 channel
* data time multiplexer with ISDN support (aka T7259) * data time multiplexer with ISDN support (aka T7259)
* Interfaces: SBus,ISDN NT & TE, CHI, 4 bits parallel. * Interfaces: SBus,ISDN NT & TE, CHI, 4 bits parallel.
* CHI: (spelled ki) Concentration Highway Interface (AT&T or Intel bus ?). * CHI: (spelled ki) Concentration Highway Interface (AT&T or Intel bus ?).
* Documentation: * Documentation:
* - "STP 4000SBus Dual Basic Rate ISDN (DBRI) Tranceiver" from * - "STP 4000SBus Dual Basic Rate ISDN (DBRI) Transceiver" from
* Sparc Technology Business (courtesy of Sun Support) * Sparc Technology Business (courtesy of Sun Support)
* - Data sheet of the T7903, a newer but very similar ISA bus equivalent * - Data sheet of the T7903, a newer but very similar ISA bus equivalent
* available from the Lucent (formarly AT&T microelectronics) home * available from the Lucent (formerly AT&T microelectronics) home
* page. * page.
* - http://www.freesoft.org/Linux/DBRI/ * - http://www.freesoft.org/Linux/DBRI/
* - MMCODEC: Crystal Semiconductor CS4215 16 bit Multimedia Audio Codec * - MMCODEC: Crystal Semiconductor CS4215 16 bit Multimedia Audio Codec
...@@ -27,21 +27,21 @@ ...@@ -27,21 +27,21 @@
* Documentation: from the Crystal Semiconductor home page. * Documentation: from the Crystal Semiconductor home page.
* *
* The DBRI is a 32 pipe machine, each pipe can transfer some bits between * The DBRI is a 32 pipe machine, each pipe can transfer some bits between
* memory and a serial device (long pipes, nr 0-15) or between two serial * memory and a serial device (long pipes, no. 0-15) or between two serial
* devices (short pipes, nr 16-31), or simply send a fixed data to a serial * devices (short pipes, no. 16-31), or simply send a fixed data to a serial
* device (short pipes). * device (short pipes).
* A timeslot defines the bit-offset and nr of bits read from a serial device. * A timeslot defines the bit-offset and no. of bits read from a serial device.
* The timeslots are linked to 6 circular lists, one for each direction for * The timeslots are linked to 6 circular lists, one for each direction for
* each serial device (NT,TE,CHI). A timeslot is associated to 1 or 2 pipes * each serial device (NT,TE,CHI). A timeslot is associated to 1 or 2 pipes
* (the second one is a monitor/tee pipe, valid only for serial input). * (the second one is a monitor/tee pipe, valid only for serial input).
* *
* The mmcodec is connected via the CHI bus and needs the data & some * The mmcodec is connected via the CHI bus and needs the data & some
* parameters (volume, output selection) timemultiplexed in 8 byte * parameters (volume, output selection) time multiplexed in 8 byte
* chunks. It also has a control mode, which serves for audio format setting. * chunks. It also has a control mode, which serves for audio format setting.
* *
* Looking at the CS4215 data sheet it is easy to set up 2 or 4 codecs on * Looking at the CS4215 data sheet it is easy to set up 2 or 4 codecs on
* the same CHI bus, so I thought perhaps it is possible to use the onboard * the same CHI bus, so I thought perhaps it is possible to use the on-board
* & the speakerbox codec simultanously, giving 2 (not very independent :-) * & the speakerbox codec simultaneously, giving 2 (not very independent :-)
* audio devices. But the SUN HW group decided against it, at least on my * audio devices. But the SUN HW group decided against it, at least on my
* LX the speakerbox connector has at least 1 pin missing and 1 wrongly * LX the speakerbox connector has at least 1 pin missing and 1 wrongly
* connected. * connected.
...@@ -56,6 +56,8 @@ ...@@ -56,6 +56,8 @@
#include <sound/driver.h> #include <sound/driver.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/irq.h>
#include <linux/io.h>
#include <sound/core.h> #include <sound/core.h>
#include <sound/pcm.h> #include <sound/pcm.h>
...@@ -64,8 +66,6 @@ ...@@ -64,8 +66,6 @@
#include <sound/control.h> #include <sound/control.h>
#include <sound/initval.h> #include <sound/initval.h>
#include <asm/irq.h>
#include <asm/io.h>
#include <asm/sbus.h> #include <asm/sbus.h>
#include <asm/atomic.h> #include <asm/atomic.h>
...@@ -76,7 +76,8 @@ MODULE_SUPPORTED_DEVICE("{{Sun,DBRI}}"); ...@@ -76,7 +76,8 @@ MODULE_SUPPORTED_DEVICE("{{Sun,DBRI}}");
static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */ static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */
static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */ static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */
static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable this card */ /* Enable this card */
static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
module_param_array(index, int, NULL, 0444); module_param_array(index, int, NULL, 0444);
MODULE_PARM_DESC(index, "Index value for Sun DBRI soundcard."); MODULE_PARM_DESC(index, "Index value for Sun DBRI soundcard.");
...@@ -104,7 +105,7 @@ static char *cmds[] = { ...@@ -104,7 +105,7 @@ static char *cmds[] = {
"SSP", "CHI", "NT", "TE", "CDEC", "TEST", "CDM", "RESRV" "SSP", "CHI", "NT", "TE", "CDEC", "TEST", "CDM", "RESRV"
}; };
#define dprintk(a, x...) if(dbri_debug & a) printk(KERN_DEBUG x) #define dprintk(a, x...) if (dbri_debug & a) printk(KERN_DEBUG x)
#else #else
#define dprintk(a, x...) do { } while (0) #define dprintk(a, x...) do { } while (0)
...@@ -219,7 +220,7 @@ static struct { ...@@ -219,7 +220,7 @@ static struct {
/* Time Slot 7, Input Setting */ /* Time Slot 7, Input Setting */
#define CS4215_LG(v) v /* Left Gain Setting 0xf: 22.5 dB */ #define CS4215_LG(v) v /* Left Gain Setting 0xf: 22.5 dB */
#define CS4215_IS (1<<4) /* Input Select: 1=Microphone, 0=Line */ #define CS4215_IS (1<<4) /* Input Select: 1=Microphone, 0=Line */
#define CS4215_OVR (1<<5) /* 1: Overrange condition occurred */ #define CS4215_OVR (1<<5) /* 1: Over range condition occurred */
#define CS4215_PIO0 (1<<6) /* Parallel I/O 0 */ #define CS4215_PIO0 (1<<6) /* Parallel I/O 0 */
#define CS4215_PIO1 (1<<7) #define CS4215_PIO1 (1<<7)
...@@ -285,7 +286,7 @@ struct dbri_pipe { ...@@ -285,7 +286,7 @@ struct dbri_pipe {
/* Per stream (playback or record) information */ /* Per stream (playback or record) information */
struct dbri_streaminfo { struct dbri_streaminfo {
struct snd_pcm_substream *substream; struct snd_pcm_substream *substream;
u32 dvma_buffer; /* Device view of Alsa DMA buffer */ u32 dvma_buffer; /* Device view of ALSA DMA buffer */
int size; /* Size of DMA buffer */ int size; /* Size of DMA buffer */
size_t offset; /* offset in user buffer */ size_t offset; /* offset in user buffer */
int pipe; /* Data pipe used */ int pipe; /* Data pipe used */
...@@ -341,11 +342,11 @@ struct snd_dbri { ...@@ -341,11 +342,11 @@ struct snd_dbri {
/* DBRI Reg1 - Mode and Interrupt Register - defines. (Page 18) */ /* DBRI Reg1 - Mode and Interrupt Register - defines. (Page 18) */
#define D_LITTLE_END (1<<8) /* Byte Order */ #define D_LITTLE_END (1<<8) /* Byte Order */
#define D_BIG_END (0<<8) /* Byte Order */ #define D_BIG_END (0<<8) /* Byte Order */
#define D_MRR (1<<4) /* Multiple Error Ack on SBus (readonly) */ #define D_MRR (1<<4) /* Multiple Error Ack on SBus (read only) */
#define D_MLE (1<<3) /* Multiple Late Error on SBus (readonly) */ #define D_MLE (1<<3) /* Multiple Late Error on SBus (read only) */
#define D_LBG (1<<2) /* Lost Bus Grant on SBus (readonly) */ #define D_LBG (1<<2) /* Lost Bus Grant on SBus (read only) */
#define D_MBE (1<<1) /* Burst Error on SBus (readonly) */ #define D_MBE (1<<1) /* Burst Error on SBus (read only) */
#define D_IR (1<<0) /* Interrupt Indicator (readonly) */ #define D_IR (1<<0) /* Interrupt Indicator (read only) */
/* DBRI Reg2 - Parallel IO Register - defines. (Page 18) */ /* DBRI Reg2 - Parallel IO Register - defines. (Page 18) */
#define D_ENPIO3 (1<<7) /* Enable Pin 3 */ #define D_ENPIO3 (1<<7) /* Enable Pin 3 */
...@@ -376,11 +377,11 @@ struct snd_dbri { ...@@ -376,11 +377,11 @@ struct snd_dbri {
#define D_CDM 0xe /* CHI Data mode command */ #define D_CDM 0xe /* CHI Data mode command */
/* Special bits for some commands */ /* Special bits for some commands */
#define D_PIPE(v) ((v)<<0) /* Pipe Nr: 0-15 long, 16-21 short */ #define D_PIPE(v) ((v)<<0) /* Pipe No.: 0-15 long, 16-21 short */
/* Setup Data Pipe */ /* Setup Data Pipe */
/* IRM */ /* IRM */
#define D_SDP_2SAME (1<<18) /* Report 2nd time in a row value rcvd */ #define D_SDP_2SAME (1<<18) /* Report 2nd time in a row value received */
#define D_SDP_CHANGE (2<<18) /* Report any changes */ #define D_SDP_CHANGE (2<<18) /* Report any changes */
#define D_SDP_EVERY (3<<18) /* Report any changes */ #define D_SDP_EVERY (3<<18) /* Report any changes */
#define D_SDP_EOL (1<<17) /* EOL interrupt enable */ #define D_SDP_EOL (1<<17) /* EOL interrupt enable */
...@@ -419,7 +420,7 @@ struct snd_dbri { ...@@ -419,7 +420,7 @@ struct snd_dbri {
#define D_TS_NONCONTIG (3<<10) /* Non contiguous mode */ #define D_TS_NONCONTIG (3<<10) /* Non contiguous mode */
#define D_TS_ANCHOR (7<<10) /* Starting short pipes */ #define D_TS_ANCHOR (7<<10) /* Starting short pipes */
#define D_TS_MON(v) ((v)<<5) /* Monitor Pipe */ #define D_TS_MON(v) ((v)<<5) /* Monitor Pipe */
#define D_TS_NEXT(v) ((v)<<0) /* Pipe Nr: 0-15 long, 16-21 short */ #define D_TS_NEXT(v) ((v)<<0) /* Pipe no.: 0-15 long, 16-21 short */
/* Concentration Highway Interface Modes */ /* Concentration Highway Interface Modes */
#define D_CHI_CHICM(v) ((v)<<16) /* Clock mode */ #define D_CHI_CHICM(v) ((v)<<16) /* Clock mode */
...@@ -435,7 +436,7 @@ struct snd_dbri { ...@@ -435,7 +436,7 @@ struct snd_dbri {
#define D_NT_NBF (1<<16) /* Number of bad frames to loose framing */ #define D_NT_NBF (1<<16) /* Number of bad frames to loose framing */
#define D_NT_IRM_IMM (1<<15) /* Interrupt Report & Mask: Immediate */ #define D_NT_IRM_IMM (1<<15) /* Interrupt Report & Mask: Immediate */
#define D_NT_IRM_EN (1<<14) /* Interrupt Report & Mask: Enable */ #define D_NT_IRM_EN (1<<14) /* Interrupt Report & Mask: Enable */
#define D_NT_ISNT (1<<13) /* Configfure interface as NT */ #define D_NT_ISNT (1<<13) /* Configure interface as NT */
#define D_NT_FT (1<<12) /* Fixed Timing */ #define D_NT_FT (1<<12) /* Fixed Timing */
#define D_NT_EZ (1<<11) /* Echo Channel is Zeros */ #define D_NT_EZ (1<<11) /* Echo Channel is Zeros */
#define D_NT_IFA (1<<10) /* Inhibit Final Activation */ #define D_NT_IFA (1<<10) /* Inhibit Final Activation */
...@@ -455,7 +456,7 @@ struct snd_dbri { ...@@ -455,7 +456,7 @@ struct snd_dbri {
#define D_TEST_RAM(v) ((v)<<16) /* RAM Pointer */ #define D_TEST_RAM(v) ((v)<<16) /* RAM Pointer */
#define D_TEST_SIZE(v) ((v)<<11) /* */ #define D_TEST_SIZE(v) ((v)<<11) /* */
#define D_TEST_ROMONOFF 0x5 /* Toggle ROM opcode monitor on/off */ #define D_TEST_ROMONOFF 0x5 /* Toggle ROM opcode monitor on/off */
#define D_TEST_PROC 0x6 /* MicroProcessor test */ #define D_TEST_PROC 0x6 /* Microprocessor test */
#define D_TEST_SER 0x7 /* Serial-Controller test */ #define D_TEST_SER 0x7 /* Serial-Controller test */
#define D_TEST_RAMREAD 0x8 /* Copy from Ram to system memory */ #define D_TEST_RAMREAD 0x8 /* Copy from Ram to system memory */
#define D_TEST_RAMWRITE 0x9 /* Copy into Ram from system memory */ #define D_TEST_RAMWRITE 0x9 /* Copy into Ram from system memory */
...@@ -464,12 +465,12 @@ struct snd_dbri { ...@@ -464,12 +465,12 @@ struct snd_dbri {
#define D_TEST_DUMP 0xe /* ROM Dump */ #define D_TEST_DUMP 0xe /* ROM Dump */
/* CHI Data Mode */ /* CHI Data Mode */
#define D_CDM_THI (1<<8) /* Transmit Data on CHIDR Pin */ #define D_CDM_THI (1 << 8) /* Transmit Data on CHIDR Pin */
#define D_CDM_RHI (1<<7) /* Receive Data on CHIDX Pin */ #define D_CDM_RHI (1 << 7) /* Receive Data on CHIDX Pin */
#define D_CDM_RCE (1<<6) /* Receive on Rising Edge of CHICK */ #define D_CDM_RCE (1 << 6) /* Receive on Rising Edge of CHICK */
#define D_CDM_XCE (1<<2) /* Transmit Data on Rising Edge of CHICK */ #define D_CDM_XCE (1 << 2) /* Transmit Data on Rising Edge of CHICK */
#define D_CDM_XEN (1<<1) /* Transmit Highway Enable */ #define D_CDM_XEN (1 << 1) /* Transmit Highway Enable */
#define D_CDM_REN (1<<0) /* Receive Highway Enable */ #define D_CDM_REN (1 << 0) /* Receive Highway Enable */
/* The Interrupts */ /* The Interrupts */
#define D_INTR_BRDY 1 /* Buffer Ready for processing */ #define D_INTR_BRDY 1 /* Buffer Ready for processing */
...@@ -493,9 +494,9 @@ struct snd_dbri { ...@@ -493,9 +494,9 @@ struct snd_dbri {
#define D_INTR_CHI 36 #define D_INTR_CHI 36
#define D_INTR_CMD 38 #define D_INTR_CMD 38
#define D_INTR_GETCHAN(v) (((v)>>24) & 0x3f) #define D_INTR_GETCHAN(v) (((v) >> 24) & 0x3f)
#define D_INTR_GETCODE(v) (((v)>>20) & 0xf) #define D_INTR_GETCODE(v) (((v) >> 20) & 0xf)
#define D_INTR_GETCMD(v) (((v)>>16) & 0xf) #define D_INTR_GETCMD(v) (((v) >> 16) & 0xf)
#define D_INTR_GETVAL(v) ((v) & 0xffff) #define D_INTR_GETVAL(v) ((v) & 0xffff)
#define D_INTR_GETRVAL(v) ((v) & 0xfffff) #define D_INTR_GETRVAL(v) ((v) & 0xfffff)
...@@ -533,32 +534,32 @@ struct snd_dbri { ...@@ -533,32 +534,32 @@ struct snd_dbri {
#define D_P_31 31 /* */ #define D_P_31 31 /* */
/* Transmit descriptor defines */ /* Transmit descriptor defines */
#define DBRI_TD_F (1<<31) /* End of Frame */ #define DBRI_TD_F (1 << 31) /* End of Frame */
#define DBRI_TD_D (1<<30) /* Do not append CRC */ #define DBRI_TD_D (1 << 30) /* Do not append CRC */
#define DBRI_TD_CNT(v) ((v)<<16) /* Number of valid bytes in the buffer */ #define DBRI_TD_CNT(v) ((v) << 16) /* Number of valid bytes in the buffer */
#define DBRI_TD_B (1<<15) /* Final interrupt */ #define DBRI_TD_B (1 << 15) /* Final interrupt */
#define DBRI_TD_M (1<<14) /* Marker interrupt */ #define DBRI_TD_M (1 << 14) /* Marker interrupt */
#define DBRI_TD_I (1<<13) /* Transmit Idle Characters */ #define DBRI_TD_I (1 << 13) /* Transmit Idle Characters */
#define DBRI_TD_FCNT(v) (v) /* Flag Count */ #define DBRI_TD_FCNT(v) (v) /* Flag Count */
#define DBRI_TD_UNR (1<<3) /* Underrun: transmitter is out of data */ #define DBRI_TD_UNR (1 << 3) /* Underrun: transmitter is out of data */
#define DBRI_TD_ABT (1<<2) /* Abort: frame aborted */ #define DBRI_TD_ABT (1 << 2) /* Abort: frame aborted */
#define DBRI_TD_TBC (1<<0) /* Transmit buffer Complete */ #define DBRI_TD_TBC (1 << 0) /* Transmit buffer Complete */
#define DBRI_TD_STATUS(v) ((v)&0xff) /* Transmit status */ #define DBRI_TD_STATUS(v) ((v) & 0xff) /* Transmit status */
/* Maximum buffer size per TD: almost 8Kb */ /* Maximum buffer size per TD: almost 8KB */
#define DBRI_TD_MAXCNT ((1 << 13) - 4) #define DBRI_TD_MAXCNT ((1 << 13) - 4)
/* Receive descriptor defines */ /* Receive descriptor defines */
#define DBRI_RD_F (1<<31) /* End of Frame */ #define DBRI_RD_F (1 << 31) /* End of Frame */
#define DBRI_RD_C (1<<30) /* Completed buffer */ #define DBRI_RD_C (1 << 30) /* Completed buffer */
#define DBRI_RD_B (1<<15) /* Final interrupt */ #define DBRI_RD_B (1 << 15) /* Final interrupt */
#define DBRI_RD_M (1<<14) /* Marker interrupt */ #define DBRI_RD_M (1 << 14) /* Marker interrupt */
#define DBRI_RD_BCNT(v) (v) /* Buffer size */ #define DBRI_RD_BCNT(v) (v) /* Buffer size */
#define DBRI_RD_CRC (1<<7) /* 0: CRC is correct */ #define DBRI_RD_CRC (1 << 7) /* 0: CRC is correct */
#define DBRI_RD_BBC (1<<6) /* 1: Bad Byte received */ #define DBRI_RD_BBC (1 << 6) /* 1: Bad Byte received */
#define DBRI_RD_ABT (1<<5) /* Abort: frame aborted */ #define DBRI_RD_ABT (1 << 5) /* Abort: frame aborted */
#define DBRI_RD_OVRN (1<<3) /* Overrun: data lost */ #define DBRI_RD_OVRN (1 << 3) /* Overrun: data lost */
#define DBRI_RD_STATUS(v) ((v)&0xff) /* Receive status */ #define DBRI_RD_STATUS(v) ((v) & 0xff) /* Receive status */
#define DBRI_RD_CNT(v) (((v)>>16)&0x1fff) /* Valid bytes in the buffer */ #define DBRI_RD_CNT(v) (((v) >> 16) & 0x1fff) /* Valid bytes in the buffer */
/* stream_info[] access */ /* stream_info[] access */
/* Translate the ALSA direction into the array index */ /* Translate the ALSA direction into the array index */
...@@ -567,7 +568,8 @@ struct snd_dbri { ...@@ -567,7 +568,8 @@ struct snd_dbri {
SNDRV_PCM_STREAM_PLAYBACK? DBRI_PLAY: DBRI_REC) SNDRV_PCM_STREAM_PLAYBACK? DBRI_PLAY: DBRI_REC)
/* Return a pointer to dbri_streaminfo */ /* Return a pointer to dbri_streaminfo */
#define DBRI_STREAM(dbri, substream) &dbri->stream_info[DBRI_STREAMNO(substream)] #define DBRI_STREAM(dbri, substream) \
&dbri->stream_info[DBRI_STREAMNO(substream)]
static struct snd_dbri *dbri_list; /* All DBRI devices */ static struct snd_dbri *dbri_list; /* All DBRI devices */
...@@ -657,7 +659,7 @@ static void dbri_cmdwait(struct snd_dbri *dbri) ...@@ -657,7 +659,7 @@ static void dbri_cmdwait(struct snd_dbri *dbri)
* Lock the command queue and returns pointer to a space for len cmd words * Lock the command queue and returns pointer to a space for len cmd words
* It locks the cmdlock spinlock. * It locks the cmdlock spinlock.
*/ */
static s32 *dbri_cmdlock(struct snd_dbri * dbri, int len) static s32 *dbri_cmdlock(struct snd_dbri *dbri, int len)
{ {
/* Space for 2 WAIT cmds (replaced later by 1 JUMP cmd) */ /* Space for 2 WAIT cmds (replaced later by 1 JUMP cmd) */
len += 2; len += 2;
...@@ -680,7 +682,7 @@ static s32 *dbri_cmdlock(struct snd_dbri * dbri, int len) ...@@ -680,7 +682,7 @@ static s32 *dbri_cmdlock(struct snd_dbri * dbri, int len)
* *
* Lock must be held before calling this. * Lock must be held before calling this.
*/ */
static void dbri_cmdsend(struct snd_dbri * dbri, s32 * cmd,int len) static void dbri_cmdsend(struct snd_dbri *dbri, s32 *cmd, int len)
{ {
s32 tmp, addr; s32 tmp, addr;
static int wait_id = 0; static int wait_id = 0;
...@@ -700,16 +702,17 @@ static void dbri_cmdsend(struct snd_dbri * dbri, s32 * cmd,int len) ...@@ -700,16 +702,17 @@ static void dbri_cmdsend(struct snd_dbri * dbri, s32 * cmd,int len)
s32 *ptr; s32 *ptr;
for (ptr = dbri->cmdptr; ptr < cmd+2; ptr++) for (ptr = dbri->cmdptr; ptr < cmd+2; ptr++)
dprintk(D_CMD, "cmd: %lx:%08x\n", (unsigned long)ptr, *ptr); dprintk(D_CMD, "cmd: %lx:%08x\n",
(unsigned long)ptr, *ptr);
} else { } else {
s32 *ptr = dbri->cmdptr; s32 *ptr = dbri->cmdptr;
dprintk(D_CMD, "cmd: %lx:%08x\n", (unsigned long)ptr, *ptr); dprintk(D_CMD, "cmd: %lx:%08x\n", (unsigned long)ptr, *ptr);
ptr++; ptr++;
dprintk(D_CMD, "cmd: %lx:%08x\n", (unsigned long)ptr, *ptr); dprintk(D_CMD, "cmd: %lx:%08x\n", (unsigned long)ptr, *ptr);
for (ptr = dbri->dma->cmd; ptr < cmd+2; ptr++) { for (ptr = dbri->dma->cmd; ptr < cmd+2; ptr++)
dprintk(D_CMD, "cmd: %lx:%08x\n", (unsigned long)ptr, *ptr); dprintk(D_CMD, "cmd: %lx:%08x\n",
} (unsigned long)ptr, *ptr);
} }
#endif #endif
...@@ -723,7 +726,7 @@ static void dbri_cmdsend(struct snd_dbri * dbri, s32 * cmd,int len) ...@@ -723,7 +726,7 @@ static void dbri_cmdsend(struct snd_dbri * dbri, s32 * cmd,int len)
} }
/* Lock must be held when calling this */ /* Lock must be held when calling this */
static void dbri_reset(struct snd_dbri * dbri) static void dbri_reset(struct snd_dbri *dbri)
{ {
int i; int i;
u32 tmp; u32 tmp;
...@@ -746,7 +749,7 @@ static void dbri_reset(struct snd_dbri * dbri) ...@@ -746,7 +749,7 @@ static void dbri_reset(struct snd_dbri * dbri)
} }
/* Lock must not be held before calling this */ /* Lock must not be held before calling this */
static void dbri_initialize(struct snd_dbri * dbri) static void dbri_initialize(struct snd_dbri *dbri)
{ {
s32 *cmd; s32 *cmd;
u32 dma_addr; u32 dma_addr;
...@@ -763,7 +766,7 @@ static void dbri_initialize(struct snd_dbri * dbri) ...@@ -763,7 +766,7 @@ static void dbri_initialize(struct snd_dbri * dbri)
spin_lock_init(&dbri->cmdlock); spin_lock_init(&dbri->cmdlock);
/* /*
* Initialize the interrupt ringbuffer. * Initialize the interrupt ring buffer.
*/ */
dma_addr = dbri->dma_dvma + dbri_dma_off(intr, 0); dma_addr = dbri->dma_dvma + dbri_dma_off(intr, 0);
dbri->dma->intr[0] = dma_addr; dbri->dma->intr[0] = dma_addr;
...@@ -801,7 +804,7 @@ list ordering, among other things. The transmit and receive functions ...@@ -801,7 +804,7 @@ list ordering, among other things. The transmit and receive functions
here interface closely with the transmit and receive interrupt code. here interface closely with the transmit and receive interrupt code.
*/ */
static int pipe_active(struct snd_dbri * dbri, int pipe) static int pipe_active(struct snd_dbri *dbri, int pipe)
{ {
return ((pipe >= 0) && (dbri->pipes[pipe].desc != -1)); return ((pipe >= 0) && (dbri->pipes[pipe].desc != -1));
} }
...@@ -811,20 +814,22 @@ static int pipe_active(struct snd_dbri * dbri, int pipe) ...@@ -811,20 +814,22 @@ static int pipe_active(struct snd_dbri * dbri, int pipe)
* Called on an in-use pipe to clear anything being transmitted or received * Called on an in-use pipe to clear anything being transmitted or received
* Lock must be held before calling this. * Lock must be held before calling this.
*/ */
static void reset_pipe(struct snd_dbri * dbri, int pipe) static void reset_pipe(struct snd_dbri *dbri, int pipe)
{ {
int sdp; int sdp;
int desc; int desc;
s32 *cmd; s32 *cmd;
if (pipe < 0 || pipe > DBRI_MAX_PIPE) { if (pipe < 0 || pipe > DBRI_MAX_PIPE) {
printk(KERN_ERR "DBRI: reset_pipe called with illegal pipe number\n"); printk(KERN_ERR "DBRI: reset_pipe called with "
"illegal pipe number\n");
return; return;
} }
sdp = dbri->pipes[pipe].sdp; sdp = dbri->pipes[pipe].sdp;
if (sdp == 0) { if (sdp == 0) {
printk(KERN_ERR "DBRI: reset_pipe called on uninitialized pipe\n"); printk(KERN_ERR "DBRI: reset_pipe called "
"on uninitialized pipe\n");
return; return;
} }
...@@ -835,9 +840,10 @@ static void reset_pipe(struct snd_dbri * dbri, int pipe) ...@@ -835,9 +840,10 @@ static void reset_pipe(struct snd_dbri * dbri, int pipe)
dbri_cmdsend(dbri, cmd, 3); dbri_cmdsend(dbri, cmd, 3);
desc = dbri->pipes[pipe].first_desc; desc = dbri->pipes[pipe].first_desc;
if ( desc >= 0) if (desc >= 0)
do { do {
dbri->dma->desc[desc].nda = dbri->dma->desc[desc].ba = 0; dbri->dma->desc[desc].ba = 0;
dbri->dma->desc[desc].nda = 0;
desc = dbri->next_desc[desc]; desc = dbri->next_desc[desc];
} while (desc != -1 && desc != dbri->pipes[pipe].first_desc); } while (desc != -1 && desc != dbri->pipes[pipe].first_desc);
...@@ -848,15 +854,17 @@ static void reset_pipe(struct snd_dbri * dbri, int pipe) ...@@ -848,15 +854,17 @@ static void reset_pipe(struct snd_dbri * dbri, int pipe)
/* /*
* Lock must be held before calling this. * Lock must be held before calling this.
*/ */
static void setup_pipe(struct snd_dbri * dbri, int pipe, int sdp) static void setup_pipe(struct snd_dbri *dbri, int pipe, int sdp)
{ {
if (pipe < 0 || pipe > DBRI_MAX_PIPE) { if (pipe < 0 || pipe > DBRI_MAX_PIPE) {
printk(KERN_ERR "DBRI: setup_pipe called with illegal pipe number\n"); printk(KERN_ERR "DBRI: setup_pipe called "
"with illegal pipe number\n");
return; return;
} }
if ((sdp & 0xf800) != sdp) { if ((sdp & 0xf800) != sdp) {
printk(KERN_ERR "DBRI: setup_pipe called with strange SDP value\n"); printk(KERN_ERR "DBRI: setup_pipe called "
"with strange SDP value\n");
/* sdp &= 0xf800; */ /* sdp &= 0xf800; */
} }
...@@ -877,7 +885,7 @@ static void setup_pipe(struct snd_dbri * dbri, int pipe, int sdp) ...@@ -877,7 +885,7 @@ static void setup_pipe(struct snd_dbri * dbri, int pipe, int sdp)
/* /*
* Lock must be held before calling this. * Lock must be held before calling this.
*/ */
static void link_time_slot(struct snd_dbri * dbri, int pipe, static void link_time_slot(struct snd_dbri *dbri, int pipe,
int prevpipe, int nextpipe, int prevpipe, int nextpipe,
int length, int cycle) int length, int cycle)
{ {
...@@ -895,7 +903,8 @@ static void link_time_slot(struct snd_dbri * dbri, int pipe, ...@@ -895,7 +903,8 @@ static void link_time_slot(struct snd_dbri * dbri, int pipe,
if (dbri->pipes[pipe].sdp == 0 if (dbri->pipes[pipe].sdp == 0
|| dbri->pipes[prevpipe].sdp == 0 || dbri->pipes[prevpipe].sdp == 0
|| dbri->pipes[nextpipe].sdp == 0) { || dbri->pipes[nextpipe].sdp == 0) {
printk(KERN_ERR "DBRI: link_time_slot called on uninitialized pipe\n"); printk(KERN_ERR "DBRI: link_time_slot called "
"on uninitialized pipe\n");
return; return;
} }
...@@ -935,7 +944,7 @@ static void link_time_slot(struct snd_dbri * dbri, int pipe, ...@@ -935,7 +944,7 @@ static void link_time_slot(struct snd_dbri * dbri, int pipe,
/* /*
* Lock must be held before calling this. * Lock must be held before calling this.
*/ */
static void unlink_time_slot(struct snd_dbri * dbri, int pipe, static void unlink_time_slot(struct snd_dbri *dbri, int pipe,
enum in_or_out direction, int prevpipe, enum in_or_out direction, int prevpipe,
int nextpipe) int nextpipe)
{ {
...@@ -985,7 +994,7 @@ static void unlink_time_slot(struct snd_dbri * dbri, int pipe, ...@@ -985,7 +994,7 @@ static void unlink_time_slot(struct snd_dbri * dbri, int pipe,
* *
* Lock must not be held before calling it. * Lock must not be held before calling it.
*/ */
static void xmit_fixed(struct snd_dbri * dbri, int pipe, unsigned int data) static void xmit_fixed(struct snd_dbri *dbri, int pipe, unsigned int data)
{ {
s32 *cmd; s32 *cmd;
unsigned long flags; unsigned long flags;
...@@ -996,7 +1005,8 @@ static void xmit_fixed(struct snd_dbri * dbri, int pipe, unsigned int data) ...@@ -996,7 +1005,8 @@ static void xmit_fixed(struct snd_dbri * dbri, int pipe, unsigned int data)
} }
if (D_SDP_MODE(dbri->pipes[pipe].sdp) == 0) { if (D_SDP_MODE(dbri->pipes[pipe].sdp) == 0) {
printk(KERN_ERR "DBRI: xmit_fixed: Uninitialized pipe %d\n", pipe); printk(KERN_ERR "DBRI: xmit_fixed: "
"Uninitialized pipe %d\n", pipe);
return; return;
} }
...@@ -1006,7 +1016,8 @@ static void xmit_fixed(struct snd_dbri * dbri, int pipe, unsigned int data) ...@@ -1006,7 +1016,8 @@ static void xmit_fixed(struct snd_dbri * dbri, int pipe, unsigned int data)
} }
if (!(dbri->pipes[pipe].sdp & D_SDP_TO_SER)) { if (!(dbri->pipes[pipe].sdp & D_SDP_TO_SER)) {
printk(KERN_ERR "DBRI: xmit_fixed: Called on receive pipe %d\n", pipe); printk(KERN_ERR "DBRI: xmit_fixed: Called on receive pipe %d\n",
pipe);
return; return;
} }
...@@ -1028,20 +1039,23 @@ static void xmit_fixed(struct snd_dbri * dbri, int pipe, unsigned int data) ...@@ -1028,20 +1039,23 @@ static void xmit_fixed(struct snd_dbri * dbri, int pipe, unsigned int data)
} }
static void recv_fixed(struct snd_dbri * dbri, int pipe, volatile __u32 * ptr) static void recv_fixed(struct snd_dbri *dbri, int pipe, volatile __u32 *ptr)
{ {
if (pipe < 16 || pipe > DBRI_MAX_PIPE) { if (pipe < 16 || pipe > DBRI_MAX_PIPE) {
printk(KERN_ERR "DBRI: recv_fixed called with illegal pipe number\n"); printk(KERN_ERR "DBRI: recv_fixed called with "
"illegal pipe number\n");
return; return;
} }
if (D_SDP_MODE(dbri->pipes[pipe].sdp) != D_SDP_FIXED) { if (D_SDP_MODE(dbri->pipes[pipe].sdp) != D_SDP_FIXED) {
printk(KERN_ERR "DBRI: recv_fixed called on non-fixed pipe %d\n", pipe); printk(KERN_ERR "DBRI: recv_fixed called on "
"non-fixed pipe %d\n", pipe);
return; return;
} }
if (dbri->pipes[pipe].sdp & D_SDP_TO_SER) { if (dbri->pipes[pipe].sdp & D_SDP_TO_SER) {
printk(KERN_ERR "DBRI: recv_fixed called on transmit pipe %d\n", pipe); printk(KERN_ERR "DBRI: recv_fixed called on "
"transmit pipe %d\n", pipe);
return; return;
} }
...@@ -1064,7 +1078,7 @@ static void recv_fixed(struct snd_dbri * dbri, int pipe, volatile __u32 * ptr) ...@@ -1064,7 +1078,7 @@ static void recv_fixed(struct snd_dbri * dbri, int pipe, volatile __u32 * ptr)
* *
* Lock must be held before calling this. * Lock must be held before calling this.
*/ */
static int setup_descs(struct snd_dbri * dbri, int streamno, unsigned int period) static int setup_descs(struct snd_dbri *dbri, int streamno, unsigned int period)
{ {
struct dbri_streaminfo *info = &dbri->stream_info[streamno]; struct dbri_streaminfo *info = &dbri->stream_info[streamno];
__u32 dvma_buffer; __u32 dvma_buffer;
...@@ -1089,8 +1103,8 @@ static int setup_descs(struct snd_dbri * dbri, int streamno, unsigned int period ...@@ -1089,8 +1103,8 @@ static int setup_descs(struct snd_dbri * dbri, int streamno, unsigned int period
if (streamno == DBRI_PLAY) { if (streamno == DBRI_PLAY) {
if (!(dbri->pipes[info->pipe].sdp & D_SDP_TO_SER)) { if (!(dbri->pipes[info->pipe].sdp & D_SDP_TO_SER)) {
printk(KERN_ERR "DBRI: setup_descs: Called on receive pipe %d\n", printk(KERN_ERR "DBRI: setup_descs: "
info->pipe); "Called on receive pipe %d\n", info->pipe);
return -2; return -2;
} }
} else { } else {
...@@ -1100,10 +1114,12 @@ static int setup_descs(struct snd_dbri * dbri, int streamno, unsigned int period ...@@ -1100,10 +1114,12 @@ static int setup_descs(struct snd_dbri * dbri, int streamno, unsigned int period
info->pipe); info->pipe);
return -2; return -2;
} }
/* Should be able to queue multiple buffers to receive on a pipe */ /* Should be able to queue multiple buffers
* to receive on a pipe
*/
if (pipe_active(dbri, info->pipe)) { if (pipe_active(dbri, info->pipe)) {
printk(KERN_ERR "DBRI: recv_on_pipe: Called on active pipe %d\n", printk(KERN_ERR "DBRI: recv_on_pipe: "
info->pipe); "Called on active pipe %d\n", info->pipe);
return -2; return -2;
} }
...@@ -1113,11 +1129,13 @@ static int setup_descs(struct snd_dbri * dbri, int streamno, unsigned int period ...@@ -1113,11 +1129,13 @@ static int setup_descs(struct snd_dbri * dbri, int streamno, unsigned int period
/* Free descriptors if pipe has any */ /* Free descriptors if pipe has any */
desc = dbri->pipes[info->pipe].first_desc; desc = dbri->pipes[info->pipe].first_desc;
if ( desc >= 0) if (desc >= 0)
do { do {
dbri->dma->desc[desc].nda = dbri->dma->desc[desc].ba = 0; dbri->dma->desc[desc].ba = 0;
dbri->dma->desc[desc].nda = 0;
desc = dbri->next_desc[desc]; desc = dbri->next_desc[desc];
} while (desc != -1 && desc != dbri->pipes[info->pipe].first_desc); } while (desc != -1 &&
desc != dbri->pipes[info->pipe].first_desc);
dbri->pipes[info->pipe].desc = -1; dbri->pipes[info->pipe].desc = -1;
dbri->pipes[info->pipe].first_desc = -1; dbri->pipes[info->pipe].first_desc = -1;
...@@ -1150,8 +1168,7 @@ static int setup_descs(struct snd_dbri * dbri, int streamno, unsigned int period ...@@ -1150,8 +1168,7 @@ static int setup_descs(struct snd_dbri * dbri, int streamno, unsigned int period
if (streamno == DBRI_PLAY) { if (streamno == DBRI_PLAY) {
dbri->dma->desc[desc].word1 = DBRI_TD_CNT(mylen); dbri->dma->desc[desc].word1 = DBRI_TD_CNT(mylen);
dbri->dma->desc[desc].word4 = 0; dbri->dma->desc[desc].word4 = 0;
dbri->dma->desc[desc].word1 |= dbri->dma->desc[desc].word1 |= DBRI_TD_F | DBRI_TD_B;
DBRI_TD_F | DBRI_TD_B;
} else { } else {
dbri->dma->desc[desc].word1 = 0; dbri->dma->desc[desc].word1 = 0;
dbri->dma->desc[desc].word4 = dbri->dma->desc[desc].word4 =
...@@ -1172,7 +1189,8 @@ static int setup_descs(struct snd_dbri * dbri, int streamno, unsigned int period ...@@ -1172,7 +1189,8 @@ static int setup_descs(struct snd_dbri * dbri, int streamno, unsigned int period
} }
if (first_desc == -1 || last_desc == -1) { if (first_desc == -1 || last_desc == -1) {
printk(KERN_ERR "DBRI: setup_descs: Not enough descriptors available\n"); printk(KERN_ERR "DBRI: setup_descs: "
" Not enough descriptors available\n");
return -1; return -1;
} }
...@@ -1183,14 +1201,14 @@ static int setup_descs(struct snd_dbri * dbri, int streamno, unsigned int period ...@@ -1183,14 +1201,14 @@ static int setup_descs(struct snd_dbri * dbri, int streamno, unsigned int period
dbri->pipes[info->pipe].desc = first_desc; dbri->pipes[info->pipe].desc = first_desc;
#ifdef DBRI_DEBUG #ifdef DBRI_DEBUG
for (desc = first_desc; desc != -1; ) { for (desc = first_desc; desc != -1;) {
dprintk(D_DESC, "DESC %d: %08x %08x %08x %08x\n", dprintk(D_DESC, "DESC %d: %08x %08x %08x %08x\n",
desc, desc,
dbri->dma->desc[desc].word1, dbri->dma->desc[desc].word1,
dbri->dma->desc[desc].ba, dbri->dma->desc[desc].ba,
dbri->dma->desc[desc].nda, dbri->dma->desc[desc].word4); dbri->dma->desc[desc].nda, dbri->dma->desc[desc].word4);
desc = dbri->next_desc[desc]; desc = dbri->next_desc[desc];
if ( desc == first_desc ) if (desc == first_desc)
break; break;
} }
#endif #endif
...@@ -1213,7 +1231,8 @@ enum master_or_slave { CHImaster, CHIslave }; ...@@ -1213,7 +1231,8 @@ enum master_or_slave { CHImaster, CHIslave };
/* /*
* Lock must not be held before calling it. * Lock must not be held before calling it.
*/ */
static void reset_chi(struct snd_dbri * dbri, enum master_or_slave master_or_slave, static void reset_chi(struct snd_dbri *dbri,
enum master_or_slave master_or_slave,
int bits_per_frame) int bits_per_frame)
{ {
s32 *cmd; s32 *cmd;
...@@ -1254,7 +1273,8 @@ static void reset_chi(struct snd_dbri * dbri, enum master_or_slave master_or_sla ...@@ -1254,7 +1273,8 @@ static void reset_chi(struct snd_dbri * dbri, enum master_or_slave master_or_sla
int divisor = 12288 / clockrate; int divisor = 12288 / clockrate;
if (divisor > 255 || divisor * clockrate != 12288) if (divisor > 255 || divisor * clockrate != 12288)
printk(KERN_ERR "DBRI: illegal bits_per_frame in setup_chi\n"); printk(KERN_ERR "DBRI: illegal bits_per_frame "
"in setup_chi\n");
*(cmd++) = DBRI_CMD(D_CHI, 0, D_CHI_CHICM(divisor) | D_CHI_FD *(cmd++) = DBRI_CMD(D_CHI, 0, D_CHI_CHICM(divisor) | D_CHI_FD
| D_CHI_BPF(bits_per_frame)); | D_CHI_BPF(bits_per_frame));
...@@ -1288,7 +1308,7 @@ to the DBRI via the CHI interface and few of the DBRI's PIO pins. ...@@ -1288,7 +1308,7 @@ to the DBRI via the CHI interface and few of the DBRI's PIO pins.
* Lock must not be held before calling it. * Lock must not be held before calling it.
*/ */
static void cs4215_setup_pipes(struct snd_dbri * dbri) static void cs4215_setup_pipes(struct snd_dbri *dbri)
{ {
unsigned long flags; unsigned long flags;
...@@ -1303,7 +1323,7 @@ static void cs4215_setup_pipes(struct snd_dbri * dbri) ...@@ -1303,7 +1323,7 @@ static void cs4215_setup_pipes(struct snd_dbri * dbri)
* not relevant for us (only for doublechecking). * not relevant for us (only for doublechecking).
* *
* Control mode: * Control mode:
* Pipe 17: Send timeslots 1-4 (slots 5-8 are readonly) * Pipe 17: Send timeslots 1-4 (slots 5-8 are read only)
* Pipe 18: Receive timeslot 1 (clb). * Pipe 18: Receive timeslot 1 (clb).
* Pipe 19: Receive timeslot 7 (version). * Pipe 19: Receive timeslot 7 (version).
*/ */
...@@ -1355,7 +1375,7 @@ static int cs4215_init_data(struct cs4215 *mm) ...@@ -1355,7 +1375,7 @@ static int cs4215_init_data(struct cs4215 *mm)
return 0; return 0;
} }
static void cs4215_setdata(struct snd_dbri * dbri, int muted) static void cs4215_setdata(struct snd_dbri *dbri, int muted)
{ {
if (muted) { if (muted) {
dbri->mm.data[0] |= 63; dbri->mm.data[0] |= 63;
...@@ -1387,7 +1407,7 @@ static void cs4215_setdata(struct snd_dbri * dbri, int muted) ...@@ -1387,7 +1407,7 @@ static void cs4215_setdata(struct snd_dbri * dbri, int muted)
/* /*
* Set the CS4215 to data mode. * Set the CS4215 to data mode.
*/ */
static void cs4215_open(struct snd_dbri * dbri) static void cs4215_open(struct snd_dbri *dbri)
{ {
int data_width; int data_width;
u32 tmp; u32 tmp;
...@@ -1452,7 +1472,7 @@ static void cs4215_open(struct snd_dbri * dbri) ...@@ -1452,7 +1472,7 @@ static void cs4215_open(struct snd_dbri * dbri)
/* /*
* Send the control information (i.e. audio format) * Send the control information (i.e. audio format)
*/ */
static int cs4215_setctrl(struct snd_dbri * dbri) static int cs4215_setctrl(struct snd_dbri *dbri)
{ {
int i, val; int i, val;
u32 tmp; u32 tmp;
...@@ -1502,7 +1522,7 @@ static int cs4215_setctrl(struct snd_dbri * dbri) ...@@ -1502,7 +1522,7 @@ static int cs4215_setctrl(struct snd_dbri * dbri)
/* /*
* Control mode: * Control mode:
* Pipe 17: Send timeslots 1-4 (slots 5-8 are readonly) * Pipe 17: Send timeslots 1-4 (slots 5-8 are read only)
* Pipe 18: Receive timeslot 1 (clb). * Pipe 18: Receive timeslot 1 (clb).
* Pipe 19: Receive timeslot 7 (version). * Pipe 19: Receive timeslot 7 (version).
*/ */
...@@ -1522,9 +1542,9 @@ static int cs4215_setctrl(struct snd_dbri * dbri) ...@@ -1522,9 +1542,9 @@ static int cs4215_setctrl(struct snd_dbri * dbri)
sbus_writel(tmp, dbri->regs + REG0); sbus_writel(tmp, dbri->regs + REG0);
spin_unlock_irqrestore(&dbri->lock, flags); spin_unlock_irqrestore(&dbri->lock, flags);
for (i = 10; ((dbri->mm.status & 0xe4) != 0x20); --i) { for (i = 10; ((dbri->mm.status & 0xe4) != 0x20); --i)
msleep_interruptible(1); msleep_interruptible(1);
}
if (i == 0) { if (i == 0) {
dprintk(D_MM, "CS4215 didn't respond to CLB (0x%02x)\n", dprintk(D_MM, "CS4215 didn't respond to CLB (0x%02x)\n",
dbri->mm.status); dbri->mm.status);
...@@ -1556,7 +1576,7 @@ static int cs4215_setctrl(struct snd_dbri * dbri) ...@@ -1556,7 +1576,7 @@ static int cs4215_setctrl(struct snd_dbri * dbri)
* As part of the process we resend the settings for the data * As part of the process we resend the settings for the data
* timeslots as well. * timeslots as well.
*/ */
static int cs4215_prepare(struct snd_dbri * dbri, unsigned int rate, static int cs4215_prepare(struct snd_dbri *dbri, unsigned int rate,
snd_pcm_format_t format, unsigned int channels) snd_pcm_format_t format, unsigned int channels)
{ {
int freq_idx; int freq_idx;
...@@ -1613,7 +1633,7 @@ static int cs4215_prepare(struct snd_dbri * dbri, unsigned int rate, ...@@ -1613,7 +1633,7 @@ static int cs4215_prepare(struct snd_dbri * dbri, unsigned int rate,
/* /*
* *
*/ */
static int cs4215_init(struct snd_dbri * dbri) static int cs4215_init(struct snd_dbri *dbri)
{ {
u32 reg2 = sbus_readl(dbri->regs + REG2); u32 reg2 = sbus_readl(dbri->regs + REG2);
dprintk(D_MM, "cs4215_init: reg2=0x%x\n", reg2); dprintk(D_MM, "cs4215_init: reg2=0x%x\n", reg2);
...@@ -1674,7 +1694,7 @@ interrupts are disabled. ...@@ -1674,7 +1694,7 @@ interrupts are disabled.
/* xmit_descs() /* xmit_descs()
* *
* Starts transmiting the current TD's for recording/playing. * Starts transmitting the current TD's for recording/playing.
* For playback, ALSA has filled the DMA memory with new data (we hope). * For playback, ALSA has filled the DMA memory with new data (we hope).
*/ */
static void xmit_descs(struct snd_dbri *dbri) static void xmit_descs(struct snd_dbri *dbri)
...@@ -1701,7 +1721,8 @@ static void xmit_descs(struct snd_dbri *dbri) ...@@ -1701,7 +1721,8 @@ static void xmit_descs(struct snd_dbri *dbri)
*(cmd++) = DBRI_CMD(D_SDP, 0, *(cmd++) = DBRI_CMD(D_SDP, 0,
dbri->pipes[info->pipe].sdp dbri->pipes[info->pipe].sdp
| D_SDP_P | D_SDP_EVERY | D_SDP_C); | D_SDP_P | D_SDP_EVERY | D_SDP_C);
*(cmd++) = dbri->dma_dvma + dbri_dma_off(desc, first_td); *(cmd++) = dbri->dma_dvma +
dbri_dma_off(desc, first_td);
dbri_cmdsend(dbri, cmd, 2); dbri_cmdsend(dbri, cmd, 2);
/* Reset our admin of the pipe. */ /* Reset our admin of the pipe. */
...@@ -1722,7 +1743,8 @@ static void xmit_descs(struct snd_dbri *dbri) ...@@ -1722,7 +1743,8 @@ static void xmit_descs(struct snd_dbri *dbri)
*(cmd++) = DBRI_CMD(D_SDP, 0, *(cmd++) = DBRI_CMD(D_SDP, 0,
dbri->pipes[info->pipe].sdp dbri->pipes[info->pipe].sdp
| D_SDP_P | D_SDP_EVERY | D_SDP_C); | D_SDP_P | D_SDP_EVERY | D_SDP_C);
*(cmd++) = dbri->dma_dvma + dbri_dma_off(desc, first_td); *(cmd++) = dbri->dma_dvma +
dbri_dma_off(desc, first_td);
dbri_cmdsend(dbri, cmd, 2); dbri_cmdsend(dbri, cmd, 2);
/* Reset our admin of the pipe. */ /* Reset our admin of the pipe. */
...@@ -1747,7 +1769,7 @@ static void xmit_descs(struct snd_dbri *dbri) ...@@ -1747,7 +1769,7 @@ static void xmit_descs(struct snd_dbri *dbri)
* *
*/ */
static void transmission_complete_intr(struct snd_dbri * dbri, int pipe) static void transmission_complete_intr(struct snd_dbri *dbri, int pipe)
{ {
struct dbri_streaminfo *info; struct dbri_streaminfo *info;
int td; int td;
...@@ -1763,9 +1785,8 @@ static void transmission_complete_intr(struct snd_dbri * dbri, int pipe) ...@@ -1763,9 +1785,8 @@ static void transmission_complete_intr(struct snd_dbri * dbri, int pipe)
} }
status = DBRI_TD_STATUS(dbri->dma->desc[td].word4); status = DBRI_TD_STATUS(dbri->dma->desc[td].word4);
if (!(status & DBRI_TD_TBC)) { if (!(status & DBRI_TD_TBC))
break; break;
}
dprintk(D_INT, "TD %d, status 0x%02x\n", td, status); dprintk(D_INT, "TD %d, status 0x%02x\n", td, status);
...@@ -1785,7 +1806,7 @@ static void transmission_complete_intr(struct snd_dbri * dbri, int pipe) ...@@ -1785,7 +1806,7 @@ static void transmission_complete_intr(struct snd_dbri * dbri, int pipe)
snd_pcm_period_elapsed(info->substream); snd_pcm_period_elapsed(info->substream);
} }
static void reception_complete_intr(struct snd_dbri * dbri, int pipe) static void reception_complete_intr(struct snd_dbri *dbri, int pipe)
{ {
struct dbri_streaminfo *info; struct dbri_streaminfo *info;
int rd = dbri->pipes[pipe].desc; int rd = dbri->pipes[pipe].desc;
...@@ -1817,7 +1838,7 @@ static void reception_complete_intr(struct snd_dbri * dbri, int pipe) ...@@ -1817,7 +1838,7 @@ static void reception_complete_intr(struct snd_dbri * dbri, int pipe)
snd_pcm_period_elapsed(info->substream); snd_pcm_period_elapsed(info->substream);
} }
static void dbri_process_one_interrupt(struct snd_dbri * dbri, int x) static void dbri_process_one_interrupt(struct snd_dbri *dbri, int x)
{ {
int val = D_INTR_GETVAL(x); int val = D_INTR_GETVAL(x);
int channel = D_INTR_GETCHAN(x); int channel = D_INTR_GETCHAN(x);
...@@ -1889,7 +1910,7 @@ static void dbri_process_one_interrupt(struct snd_dbri * dbri, int x) ...@@ -1889,7 +1910,7 @@ static void dbri_process_one_interrupt(struct snd_dbri * dbri, int x)
* right now). Non-zero words require processing and are handed off * right now). Non-zero words require processing and are handed off
* to dbri_process_one_interrupt AFTER advancing the pointer. * to dbri_process_one_interrupt AFTER advancing the pointer.
*/ */
static void dbri_process_interrupt_buffer(struct snd_dbri * dbri) static void dbri_process_interrupt_buffer(struct snd_dbri *dbri)
{ {
s32 x; s32 x;
...@@ -2011,7 +2032,8 @@ static int snd_hw_rule_channels(struct snd_pcm_hw_params *params, ...@@ -2011,7 +2032,8 @@ static int snd_hw_rule_channels(struct snd_pcm_hw_params *params,
snd_interval_any(&ch); snd_interval_any(&ch);
if (!(f->bits[0] & SNDRV_PCM_FMTBIT_S16_BE)) { if (!(f->bits[0] & SNDRV_PCM_FMTBIT_S16_BE)) {
ch.min = ch.max = 1; ch.min = 1;
ch.max = 1;
ch.integer = 1; ch.integer = 1;
return snd_interval_refine(c, &ch); return snd_interval_refine(c, &ch);
} }
...@@ -2035,10 +2057,10 @@ static int snd_dbri_open(struct snd_pcm_substream *substream) ...@@ -2035,10 +2057,10 @@ static int snd_dbri_open(struct snd_pcm_substream *substream)
info->pipe = -1; info->pipe = -1;
spin_unlock_irqrestore(&dbri->lock, flags); spin_unlock_irqrestore(&dbri->lock, flags);
snd_pcm_hw_rule_add(runtime,0,SNDRV_PCM_HW_PARAM_CHANNELS, snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,
snd_hw_rule_format, NULL, SNDRV_PCM_HW_PARAM_FORMAT, snd_hw_rule_format, NULL, SNDRV_PCM_HW_PARAM_FORMAT,
-1); -1);
snd_pcm_hw_rule_add(runtime,0,SNDRV_PCM_HW_PARAM_FORMAT, snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_FORMAT,
snd_hw_rule_channels, NULL, snd_hw_rule_channels, NULL,
SNDRV_PCM_HW_PARAM_CHANNELS, SNDRV_PCM_HW_PARAM_CHANNELS,
-1); -1);
...@@ -2145,7 +2167,7 @@ static int snd_dbri_prepare(struct snd_pcm_substream *substream) ...@@ -2145,7 +2167,7 @@ static int snd_dbri_prepare(struct snd_pcm_substream *substream)
spin_lock_irq(&dbri->lock); spin_lock_irq(&dbri->lock);
info->offset = 0; info->offset = 0;
/* Setup the all the transmit/receive desciptors to cover the /* Setup the all the transmit/receive descriptors to cover the
* whole DMA buffer. * whole DMA buffer.
*/ */
ret = setup_descs(dbri, DBRI_STREAMNO(substream), ret = setup_descs(dbri, DBRI_STREAMNO(substream),
...@@ -2205,7 +2227,7 @@ static struct snd_pcm_ops snd_dbri_ops = { ...@@ -2205,7 +2227,7 @@ static struct snd_pcm_ops snd_dbri_ops = {
.pointer = snd_dbri_pointer, .pointer = snd_dbri_pointer,
}; };
static int __devinit snd_dbri_pcm(struct snd_dbri * dbri) static int __devinit snd_dbri_pcm(struct snd_dbri *dbri)
{ {
struct snd_pcm *pcm; struct snd_pcm *pcm;
int err; int err;
...@@ -2228,9 +2250,8 @@ static int __devinit snd_dbri_pcm(struct snd_dbri * dbri) ...@@ -2228,9 +2250,8 @@ static int __devinit snd_dbri_pcm(struct snd_dbri * dbri)
if ((err = snd_pcm_lib_preallocate_pages_for_all(pcm, if ((err = snd_pcm_lib_preallocate_pages_for_all(pcm,
SNDRV_DMA_TYPE_CONTINUOUS, SNDRV_DMA_TYPE_CONTINUOUS,
snd_dma_continuous_data(GFP_KERNEL), snd_dma_continuous_data(GFP_KERNEL),
64 * 1024, 64 * 1024)) < 0) { 64 * 1024, 64 * 1024)) < 0)
return err; return err;
}
return 0; return 0;
} }
...@@ -2271,7 +2292,8 @@ static int snd_cs4215_put_volume(struct snd_kcontrol *kcontrol, ...@@ -2271,7 +2292,8 @@ static int snd_cs4215_put_volume(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
struct snd_dbri *dbri = snd_kcontrol_chip(kcontrol); struct snd_dbri *dbri = snd_kcontrol_chip(kcontrol);
struct dbri_streaminfo *info = &dbri->stream_info[kcontrol->private_value]; struct dbri_streaminfo *info =
&dbri->stream_info[kcontrol->private_value];
int changed = 0; int changed = 0;
if (info->left_gain != ucontrol->value.integer.value[0]) { if (info->left_gain != ucontrol->value.integer.value[0]) {
...@@ -2316,18 +2338,16 @@ static int snd_cs4215_get_single(struct snd_kcontrol *kcontrol, ...@@ -2316,18 +2338,16 @@ static int snd_cs4215_get_single(struct snd_kcontrol *kcontrol,
int invert = (kcontrol->private_value >> 24) & 1; int invert = (kcontrol->private_value >> 24) & 1;
snd_assert(dbri != NULL, return -EINVAL); snd_assert(dbri != NULL, return -EINVAL);
if (elem < 4) { if (elem < 4)
ucontrol->value.integer.value[0] = ucontrol->value.integer.value[0] =
(dbri->mm.data[elem] >> shift) & mask; (dbri->mm.data[elem] >> shift) & mask;
} else { else
ucontrol->value.integer.value[0] = ucontrol->value.integer.value[0] =
(dbri->mm.ctrl[elem - 4] >> shift) & mask; (dbri->mm.ctrl[elem - 4] >> shift) & mask;
}
if (invert == 1) { if (invert == 1)
ucontrol->value.integer.value[0] = ucontrol->value.integer.value[0] =
mask - ucontrol->value.integer.value[0]; mask - ucontrol->value.integer.value[0];
}
return 0; return 0;
} }
...@@ -2379,10 +2399,11 @@ static int snd_cs4215_put_single(struct snd_kcontrol *kcontrol, ...@@ -2379,10 +2399,11 @@ static int snd_cs4215_put_single(struct snd_kcontrol *kcontrol,
number of bits. invert is a boolean for use with attenuation. number of bits. invert is a boolean for use with attenuation.
*/ */
#define CS4215_SINGLE(xname, entry, shift, mask, invert) \ #define CS4215_SINGLE(xname, entry, shift, mask, invert) \
{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \ { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \
.info = snd_cs4215_info_single, \ .info = snd_cs4215_info_single, \
.get = snd_cs4215_get_single, .put = snd_cs4215_put_single, \ .get = snd_cs4215_get_single, .put = snd_cs4215_put_single, \
.private_value = entry | (shift << 8) | (mask << 16) | (invert << 24) }, .private_value = (entry) | ((shift) << 8) | ((mask) << 16) | \
((invert) << 24) },
static struct snd_kcontrol_new dbri_controls[] __devinitdata = { static struct snd_kcontrol_new dbri_controls[] __devinitdata = {
{ {
...@@ -2411,7 +2432,7 @@ static struct snd_kcontrol_new dbri_controls[] __devinitdata = { ...@@ -2411,7 +2432,7 @@ static struct snd_kcontrol_new dbri_controls[] __devinitdata = {
CS4215_SINGLE("Mic boost", 4, 4, 1, 1) CS4215_SINGLE("Mic boost", 4, 4, 1, 1)
}; };
static int __init snd_dbri_mixer(struct snd_dbri * dbri) static int __init snd_dbri_mixer(struct snd_dbri *dbri)
{ {
struct snd_card *card; struct snd_card *card;
int idx, err; int idx, err;
...@@ -2438,7 +2459,8 @@ static int __init snd_dbri_mixer(struct snd_dbri * dbri) ...@@ -2438,7 +2459,8 @@ static int __init snd_dbri_mixer(struct snd_dbri * dbri)
/**************************************************************************** /****************************************************************************
/proc interface /proc interface
****************************************************************************/ ****************************************************************************/
static void dbri_regs_read(struct snd_info_entry * entry, struct snd_info_buffer *buffer) static void dbri_regs_read(struct snd_info_entry *entry,
struct snd_info_buffer *buffer)
{ {
struct snd_dbri *dbri = entry->private_data; struct snd_dbri *dbri = entry->private_data;
...@@ -2449,7 +2471,7 @@ static void dbri_regs_read(struct snd_info_entry * entry, struct snd_info_buffer ...@@ -2449,7 +2471,7 @@ static void dbri_regs_read(struct snd_info_entry * entry, struct snd_info_buffer
} }
#ifdef DBRI_DEBUG #ifdef DBRI_DEBUG
static void dbri_debug_read(struct snd_info_entry * entry, static void dbri_debug_read(struct snd_info_entry *entry,
struct snd_info_buffer *buffer) struct snd_info_buffer *buffer)
{ {
struct snd_dbri *dbri = entry->private_data; struct snd_dbri *dbri = entry->private_data;
...@@ -2463,7 +2485,8 @@ static void dbri_debug_read(struct snd_info_entry * entry, ...@@ -2463,7 +2485,8 @@ static void dbri_debug_read(struct snd_info_entry * entry,
"Pipe %d: %s SDP=0x%x desc=%d, " "Pipe %d: %s SDP=0x%x desc=%d, "
"len=%d next %d\n", "len=%d next %d\n",
pipe, pipe,
((pptr->sdp & D_SDP_TO_SER) ? "output" : "input"), ((pptr->sdp & D_SDP_TO_SER) ? "output" :
"input"),
pptr->sdp, pptr->desc, pptr->sdp, pptr->desc,
pptr->length, pptr->nextpipe); pptr->length, pptr->nextpipe);
} }
...@@ -2471,11 +2494,11 @@ static void dbri_debug_read(struct snd_info_entry * entry, ...@@ -2471,11 +2494,11 @@ static void dbri_debug_read(struct snd_info_entry * entry,
} }
#endif #endif
void snd_dbri_proc(struct snd_dbri * dbri) void snd_dbri_proc(struct snd_dbri *dbri)
{ {
struct snd_info_entry *entry; struct snd_info_entry *entry;
if (! snd_card_proc_new(dbri->card, "regs", &entry)) if (!snd_card_proc_new(dbri->card, "regs", &entry))
snd_info_set_text_ops(entry, dbri, dbri_regs_read); snd_info_set_text_ops(entry, dbri, dbri_regs_read);
#ifdef DBRI_DEBUG #ifdef DBRI_DEBUG
...@@ -2491,7 +2514,7 @@ void snd_dbri_proc(struct snd_dbri * dbri) ...@@ -2491,7 +2514,7 @@ void snd_dbri_proc(struct snd_dbri * dbri)
**************************** Initialization ******************************** **************************** Initialization ********************************
**************************************************************************** ****************************************************************************
*/ */
static void snd_dbri_free(struct snd_dbri * dbri); static void snd_dbri_free(struct snd_dbri *dbri);
static int __init snd_dbri_create(struct snd_card *card, static int __init snd_dbri_create(struct snd_card *card,
struct sbus_dev *sdev, struct sbus_dev *sdev,
...@@ -2547,7 +2570,7 @@ static int __init snd_dbri_create(struct snd_card *card, ...@@ -2547,7 +2570,7 @@ static int __init snd_dbri_create(struct snd_card *card,
return 0; return 0;
} }
static void snd_dbri_free(struct snd_dbri * dbri) static void snd_dbri_free(struct snd_dbri *dbri)
{ {
dprintk(D_GEN, "snd_dbri_free\n"); dprintk(D_GEN, "snd_dbri_free\n");
dbri_reset(dbri); dbri_reset(dbri);
...@@ -2587,7 +2610,8 @@ static int __init dbri_attach(int prom_node, struct sbus_dev *sdev) ...@@ -2587,7 +2610,8 @@ static int __init dbri_attach(int prom_node, struct sbus_dev *sdev)
err = prom_getproperty(prom_node, "intr", (char *)&irq, sizeof(irq)); err = prom_getproperty(prom_node, "intr", (char *)&irq, sizeof(irq));
if (err < 0) { if (err < 0) {
printk(KERN_ERR "DBRI-%d: Firmware node lacks IRQ property.\n", dev); printk(KERN_ERR "DBRI-%d: Firmware node lacks IRQ property.\n",
dev);
return -ENODEV; return -ENODEV;
} }
...@@ -2612,13 +2636,15 @@ static int __init dbri_attach(int prom_node, struct sbus_dev *sdev) ...@@ -2612,13 +2636,15 @@ static int __init dbri_attach(int prom_node, struct sbus_dev *sdev)
if ((err = snd_dbri_pcm(dbri)) < 0) if ((err = snd_dbri_pcm(dbri)) < 0)
goto _err; goto _err;
if ((err = snd_dbri_mixer(dbri)) < 0)
if ((err = snd_dbri_mixer(dbri)) < 0) if ((err = snd_dbri_mixer(dbri)) < 0)
goto _err; goto _err;
/* /proc file handling */ /* /proc file handling */
snd_dbri_proc(dbri); snd_dbri_proc(dbri);
if ((err = snd_card_register(card)) < 0) err = snd_card_register(card);
if (err < 0)
goto _err; goto _err;
printk(KERN_INFO "audio%d at %p (irq %d) is DBRI(%c)+CS4215(%d)\n", printk(KERN_INFO "audio%d at %p (irq %d) is DBRI(%c)+CS4215(%d)\n",
...@@ -2628,7 +2654,7 @@ static int __init dbri_attach(int prom_node, struct sbus_dev *sdev) ...@@ -2628,7 +2654,7 @@ static int __init dbri_attach(int prom_node, struct sbus_dev *sdev)
return 0; return 0;
_err: _err:
snd_dbri_free(dbri); snd_dbri_free(dbri);
snd_card_free(card); snd_card_free(card);
return err; return err;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment