---

yaml --- r: 92259 b: refs/heads/master c: b415ed4 h: refs/heads/master i: 92257: 40fc9a9 92255: ba846a1 v: v3
git-mirror · Apr 24, 2008 · 519dd36 · 519dd36
1 parent 25803d6
commit 519dd36
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: efd89d9dcf75ab0a31b200db0ae4ae19cad25e48
+refs/heads/master: b415ed45f4db9f8365daac84cf2518642a174dc0
diff --git a/trunk/include/sound/mpu401.h b/trunk/include/sound/mpu401.h
@@ -102,6 +102,21 @@ struct snd_mpu401 {
 #define MPU401C(mpu) (mpu)->cport
 #define MPU401D(mpu) (mpu)->port
 
+/*
+ * control register bits
+ */
+/* read MPU401C() */
+#define MPU401_RX_EMPTY		0x80
+#define MPU401_TX_FULL		0x40
+
+/* write MPU401C() */
+#define MPU401_RESET		0xff
+#define MPU401_ENTER_UART	0x3f
+
+/* read MPU401D() */
+#define MPU401_ACK		0xfe
+
+
 /*
 
  */

diff --git a/trunk/sound/drivers/mpu401/mpu401_uart.c b/trunk/sound/drivers/mpu401/mpu401_uart.c
@@ -49,12 +49,10 @@ static void snd_mpu401_uart_output_write(struct snd_mpu401 * mpu);
 
  */
 
-#define snd_mpu401_input_avail(mpu)	(!(mpu->read(mpu, MPU401C(mpu)) & 0x80))
-#define snd_mpu401_output_ready(mpu)	(!(mpu->read(mpu, MPU401C(mpu)) & 0x40))
-
-#define MPU401_RESET		0xff
-#define MPU401_ENTER_UART	0x3f
-#define MPU401_ACK		0xfe
+#define snd_mpu401_input_avail(mpu) \
+	(!(mpu->read(mpu, MPU401C(mpu)) & MPU401_RX_EMPTY))
+#define snd_mpu401_output_ready(mpu) \
+	(!(mpu->read(mpu, MPU401C(mpu)) & MPU401_TX_FULL))
 
 /* Build in lowlevel io */
 static void mpu401_write_port(struct snd_mpu401 *mpu, unsigned char data,