|
@@ -43,8 +43,8 @@ MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
|
|
|
MODULE_DESCRIPTION("Routines for control of MPU-401 in UART mode");
|
|
|
MODULE_LICENSE("GPL");
|
|
|
|
|
|
-static void snd_mpu401_uart_input_read(mpu401_t * mpu);
|
|
|
-static void snd_mpu401_uart_output_write(mpu401_t * mpu);
|
|
|
+static void snd_mpu401_uart_input_read(struct snd_mpu401 * mpu);
|
|
|
+static void snd_mpu401_uart_output_write(struct snd_mpu401 * mpu);
|
|
|
|
|
|
/*
|
|
|
|
|
@@ -58,28 +58,28 @@ static void snd_mpu401_uart_output_write(mpu401_t * mpu);
|
|
|
#define MPU401_ACK 0xfe
|
|
|
|
|
|
/* Build in lowlevel io */
|
|
|
-static void mpu401_write_port(mpu401_t *mpu, unsigned char data, unsigned long addr)
|
|
|
+static void mpu401_write_port(struct snd_mpu401 *mpu, unsigned char data, unsigned long addr)
|
|
|
{
|
|
|
outb(data, addr);
|
|
|
}
|
|
|
|
|
|
-static unsigned char mpu401_read_port(mpu401_t *mpu, unsigned long addr)
|
|
|
+static unsigned char mpu401_read_port(struct snd_mpu401 *mpu, unsigned long addr)
|
|
|
{
|
|
|
return inb(addr);
|
|
|
}
|
|
|
|
|
|
-static void mpu401_write_mmio(mpu401_t *mpu, unsigned char data, unsigned long addr)
|
|
|
+static void mpu401_write_mmio(struct snd_mpu401 *mpu, unsigned char data, unsigned long addr)
|
|
|
{
|
|
|
writeb(data, (void __iomem *)addr);
|
|
|
}
|
|
|
|
|
|
-static unsigned char mpu401_read_mmio(mpu401_t *mpu, unsigned long addr)
|
|
|
+static unsigned char mpu401_read_mmio(struct snd_mpu401 *mpu, unsigned long addr)
|
|
|
{
|
|
|
return readb((void __iomem *)addr);
|
|
|
}
|
|
|
/* */
|
|
|
|
|
|
-static void snd_mpu401_uart_clear_rx(mpu401_t *mpu)
|
|
|
+static void snd_mpu401_uart_clear_rx(struct snd_mpu401 *mpu)
|
|
|
{
|
|
|
int timeout = 100000;
|
|
|
for (; timeout > 0 && snd_mpu401_input_avail(mpu); timeout--)
|
|
@@ -90,7 +90,7 @@ static void snd_mpu401_uart_clear_rx(mpu401_t *mpu)
|
|
|
#endif
|
|
|
}
|
|
|
|
|
|
-static void _snd_mpu401_uart_interrupt(mpu401_t *mpu)
|
|
|
+static void _snd_mpu401_uart_interrupt(struct snd_mpu401 *mpu)
|
|
|
{
|
|
|
spin_lock(&mpu->input_lock);
|
|
|
if (test_bit(MPU401_MODE_BIT_INPUT, &mpu->mode)) {
|
|
@@ -118,7 +118,7 @@ static void _snd_mpu401_uart_interrupt(mpu401_t *mpu)
|
|
|
*/
|
|
|
irqreturn_t snd_mpu401_uart_interrupt(int irq, void *dev_id, struct pt_regs *regs)
|
|
|
{
|
|
|
- mpu401_t *mpu = dev_id;
|
|
|
+ struct snd_mpu401 *mpu = dev_id;
|
|
|
|
|
|
if (mpu == NULL)
|
|
|
return IRQ_NONE;
|
|
@@ -132,7 +132,7 @@ irqreturn_t snd_mpu401_uart_interrupt(int irq, void *dev_id, struct pt_regs *reg
|
|
|
*/
|
|
|
static void snd_mpu401_uart_timer(unsigned long data)
|
|
|
{
|
|
|
- mpu401_t *mpu = (mpu401_t *)data;
|
|
|
+ struct snd_mpu401 *mpu = (struct snd_mpu401 *)data;
|
|
|
|
|
|
spin_lock(&mpu->timer_lock);
|
|
|
/*mpu->mode |= MPU401_MODE_TIMER;*/
|
|
@@ -146,7 +146,7 @@ static void snd_mpu401_uart_timer(unsigned long data)
|
|
|
/*
|
|
|
* initialize the timer callback if not programmed yet
|
|
|
*/
|
|
|
-static void snd_mpu401_uart_add_timer (mpu401_t *mpu, int input)
|
|
|
+static void snd_mpu401_uart_add_timer (struct snd_mpu401 *mpu, int input)
|
|
|
{
|
|
|
unsigned long flags;
|
|
|
|
|
@@ -165,7 +165,7 @@ static void snd_mpu401_uart_add_timer (mpu401_t *mpu, int input)
|
|
|
/*
|
|
|
* remove the timer callback if still active
|
|
|
*/
|
|
|
-static void snd_mpu401_uart_remove_timer (mpu401_t *mpu, int input)
|
|
|
+static void snd_mpu401_uart_remove_timer (struct snd_mpu401 *mpu, int input)
|
|
|
{
|
|
|
unsigned long flags;
|
|
|
|
|
@@ -182,7 +182,7 @@ static void snd_mpu401_uart_remove_timer (mpu401_t *mpu, int input)
|
|
|
|
|
|
*/
|
|
|
|
|
|
-static void snd_mpu401_uart_cmd(mpu401_t * mpu, unsigned char cmd, int ack)
|
|
|
+static void snd_mpu401_uart_cmd(struct snd_mpu401 * mpu, unsigned char cmd, int ack)
|
|
|
{
|
|
|
unsigned long flags;
|
|
|
int timeout, ok;
|
|
@@ -225,9 +225,9 @@ static void snd_mpu401_uart_cmd(mpu401_t * mpu, unsigned char cmd, int ack)
|
|
|
/*
|
|
|
* input/output open/close - protected by open_mutex in rawmidi.c
|
|
|
*/
|
|
|
-static int snd_mpu401_uart_input_open(snd_rawmidi_substream_t * substream)
|
|
|
+static int snd_mpu401_uart_input_open(struct snd_rawmidi_substream *substream)
|
|
|
{
|
|
|
- mpu401_t *mpu;
|
|
|
+ struct snd_mpu401 *mpu;
|
|
|
int err;
|
|
|
|
|
|
mpu = substream->rmidi->private_data;
|
|
@@ -242,9 +242,9 @@ static int snd_mpu401_uart_input_open(snd_rawmidi_substream_t * substream)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-static int snd_mpu401_uart_output_open(snd_rawmidi_substream_t * substream)
|
|
|
+static int snd_mpu401_uart_output_open(struct snd_rawmidi_substream *substream)
|
|
|
{
|
|
|
- mpu401_t *mpu;
|
|
|
+ struct snd_mpu401 *mpu;
|
|
|
int err;
|
|
|
|
|
|
mpu = substream->rmidi->private_data;
|
|
@@ -259,9 +259,9 @@ static int snd_mpu401_uart_output_open(snd_rawmidi_substream_t * substream)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-static int snd_mpu401_uart_input_close(snd_rawmidi_substream_t * substream)
|
|
|
+static int snd_mpu401_uart_input_close(struct snd_rawmidi_substream *substream)
|
|
|
{
|
|
|
- mpu401_t *mpu;
|
|
|
+ struct snd_mpu401 *mpu;
|
|
|
|
|
|
mpu = substream->rmidi->private_data;
|
|
|
clear_bit(MPU401_MODE_BIT_INPUT, &mpu->mode);
|
|
@@ -273,9 +273,9 @@ static int snd_mpu401_uart_input_close(snd_rawmidi_substream_t * substream)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-static int snd_mpu401_uart_output_close(snd_rawmidi_substream_t * substream)
|
|
|
+static int snd_mpu401_uart_output_close(struct snd_rawmidi_substream *substream)
|
|
|
{
|
|
|
- mpu401_t *mpu;
|
|
|
+ struct snd_mpu401 *mpu;
|
|
|
|
|
|
mpu = substream->rmidi->private_data;
|
|
|
clear_bit(MPU401_MODE_BIT_OUTPUT, &mpu->mode);
|
|
@@ -290,10 +290,10 @@ static int snd_mpu401_uart_output_close(snd_rawmidi_substream_t * substream)
|
|
|
/*
|
|
|
* trigger input callback
|
|
|
*/
|
|
|
-static void snd_mpu401_uart_input_trigger(snd_rawmidi_substream_t * substream, int up)
|
|
|
+static void snd_mpu401_uart_input_trigger(struct snd_rawmidi_substream *substream, int up)
|
|
|
{
|
|
|
unsigned long flags;
|
|
|
- mpu401_t *mpu;
|
|
|
+ struct snd_mpu401 *mpu;
|
|
|
int max = 64;
|
|
|
|
|
|
mpu = substream->rmidi->private_data;
|
|
@@ -321,7 +321,7 @@ static void snd_mpu401_uart_input_trigger(snd_rawmidi_substream_t * substream, i
|
|
|
* transfer input pending data
|
|
|
* call with input_lock spinlock held
|
|
|
*/
|
|
|
-static void snd_mpu401_uart_input_read(mpu401_t * mpu)
|
|
|
+static void snd_mpu401_uart_input_read(struct snd_mpu401 * mpu)
|
|
|
{
|
|
|
int max = 128;
|
|
|
unsigned char byte;
|
|
@@ -349,7 +349,7 @@ static void snd_mpu401_uart_input_read(mpu401_t * mpu)
|
|
|
* write output pending bytes
|
|
|
* call with output_lock spinlock held
|
|
|
*/
|
|
|
-static void snd_mpu401_uart_output_write(mpu401_t * mpu)
|
|
|
+static void snd_mpu401_uart_output_write(struct snd_mpu401 * mpu)
|
|
|
{
|
|
|
unsigned char byte;
|
|
|
int max = 256, timeout;
|
|
@@ -375,10 +375,10 @@ static void snd_mpu401_uart_output_write(mpu401_t * mpu)
|
|
|
/*
|
|
|
* output trigger callback
|
|
|
*/
|
|
|
-static void snd_mpu401_uart_output_trigger(snd_rawmidi_substream_t * substream, int up)
|
|
|
+static void snd_mpu401_uart_output_trigger(struct snd_rawmidi_substream *substream, int up)
|
|
|
{
|
|
|
unsigned long flags;
|
|
|
- mpu401_t *mpu;
|
|
|
+ struct snd_mpu401 *mpu;
|
|
|
|
|
|
mpu = substream->rmidi->private_data;
|
|
|
if (up) {
|
|
@@ -404,23 +404,23 @@ static void snd_mpu401_uart_output_trigger(snd_rawmidi_substream_t * substream,
|
|
|
|
|
|
*/
|
|
|
|
|
|
-static snd_rawmidi_ops_t snd_mpu401_uart_output =
|
|
|
+static struct snd_rawmidi_ops snd_mpu401_uart_output =
|
|
|
{
|
|
|
.open = snd_mpu401_uart_output_open,
|
|
|
.close = snd_mpu401_uart_output_close,
|
|
|
.trigger = snd_mpu401_uart_output_trigger,
|
|
|
};
|
|
|
|
|
|
-static snd_rawmidi_ops_t snd_mpu401_uart_input =
|
|
|
+static struct snd_rawmidi_ops snd_mpu401_uart_input =
|
|
|
{
|
|
|
.open = snd_mpu401_uart_input_open,
|
|
|
.close = snd_mpu401_uart_input_close,
|
|
|
.trigger = snd_mpu401_uart_input_trigger,
|
|
|
};
|
|
|
|
|
|
-static void snd_mpu401_uart_free(snd_rawmidi_t *rmidi)
|
|
|
+static void snd_mpu401_uart_free(struct snd_rawmidi *rmidi)
|
|
|
{
|
|
|
- mpu401_t *mpu = rmidi->private_data;
|
|
|
+ struct snd_mpu401 *mpu = rmidi->private_data;
|
|
|
if (mpu->irq_flags && mpu->irq >= 0)
|
|
|
free_irq(mpu->irq, (void *) mpu);
|
|
|
release_and_free_resource(mpu->res);
|
|
@@ -442,18 +442,18 @@ static void snd_mpu401_uart_free(snd_rawmidi_t *rmidi)
|
|
|
*
|
|
|
* Note that the rawmidi instance is returned on the rrawmidi argument,
|
|
|
* not the mpu401 instance itself. To access to the mpu401 instance,
|
|
|
- * cast from rawmidi->private_data (with mpu401_t magic-cast).
|
|
|
+ * cast from rawmidi->private_data (with struct snd_mpu401 magic-cast).
|
|
|
*
|
|
|
* Returns zero if successful, or a negative error code.
|
|
|
*/
|
|
|
-int snd_mpu401_uart_new(snd_card_t * card, int device,
|
|
|
+int snd_mpu401_uart_new(struct snd_card *card, int device,
|
|
|
unsigned short hardware,
|
|
|
unsigned long port, int integrated,
|
|
|
int irq, int irq_flags,
|
|
|
- snd_rawmidi_t ** rrawmidi)
|
|
|
+ struct snd_rawmidi ** rrawmidi)
|
|
|
{
|
|
|
- mpu401_t *mpu;
|
|
|
- snd_rawmidi_t *rmidi;
|
|
|
+ struct snd_mpu401 *mpu;
|
|
|
+ struct snd_rawmidi *rmidi;
|
|
|
int err;
|
|
|
|
|
|
if (rrawmidi)
|