diff options
| author | hathach <[email protected]> | 2019-07-02 16:42:12 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2019-07-02 16:42:12 +0700 |
| commit | 3f3ef6f4e659ba53794667893bf7ee6be77f5d91 (patch) | |
| tree | afeafda1abb81485e43b8ed382e0d28d0f84fdbe /src/class/midi | |
| parent | 57433135ce0fd08b13bd4065ab3dcc9ec2fb3856 (diff) | |
clean up
Diffstat (limited to 'src/class/midi')
| -rw-r--r-- | src/class/midi/midi_device.c | 7 | ||||
| -rw-r--r-- | src/class/midi/midi_device.h | 61 |
2 files changed, 42 insertions, 26 deletions
diff --git a/src/class/midi/midi_device.c b/src/class/midi/midi_device.c index 65a8df65d..fbfbcae01 100644 --- a/src/class/midi/midi_device.c +++ b/src/class/midi/midi_device.c @@ -87,12 +87,6 @@ uint32_t tud_midi_n_available(uint8_t itf, uint8_t jack_id) return tu_fifo_count(&_midid_itf[itf].rx_ff);
}
-char tud_midi_n_read_char(uint8_t itf, uint8_t jack_id)
-{
- char ch;
- return tu_fifo_read(&_midid_itf[itf].rx_ff, &ch) ? ch : (-1);
-}
-
uint32_t tud_midi_n_read(uint8_t itf, uint8_t jack_id, void* buffer, uint32_t bufsize)
{
return tu_fifo_read_n(&_midid_itf[itf].rx_ff, buffer, bufsize);
@@ -103,7 +97,6 @@ void tud_midi_n_read_flush (uint8_t itf, uint8_t jack_id) tu_fifo_clear(&_midid_itf[itf].rx_ff);
}
-
void midi_rx_done_cb(midid_interface_t* midi, uint8_t const* buffer, uint32_t bufsize) {
if (bufsize % 4 != 0) {
return;
diff --git a/src/class/midi/midi_device.h b/src/class/midi/midi_device.h index db9952656..c08b119a1 100644 --- a/src/class/midi/midi_device.h +++ b/src/class/midi/midi_device.h @@ -51,42 +51,65 @@ * @{ */
//--------------------------------------------------------------------+
-// APPLICATION API (Multiple Interfaces)
+// Application API (Multiple Interfaces)
// CFG_TUD_MIDI > 1
//--------------------------------------------------------------------+
bool tud_midi_n_connected (uint8_t itf);
-
uint32_t tud_midi_n_available (uint8_t itf, uint8_t jack_id);
-char tud_midi_n_read_char (uint8_t itf, uint8_t jack_id);
uint32_t tud_midi_n_read (uint8_t itf, uint8_t jack_id, void* buffer, uint32_t bufsize);
void tud_midi_n_read_flush (uint8_t itf, uint8_t jack_id);
-char tud_midi_n_peek (uint8_t itf, uint8_t jack_id, int pos);
-
-uint32_t tud_midi_n_write_char (uint8_t itf, char ch);
uint32_t tud_midi_n_write (uint8_t itf, uint8_t jack_id, uint8_t const* buffer, uint32_t bufsize);
bool tud_midi_n_write_flush (uint8_t itf);
//--------------------------------------------------------------------+
-// APPLICATION API (Interface0)
+// Application API (Interface0)
//--------------------------------------------------------------------+
-static inline bool tud_midi_connected (void) { return tud_midi_n_connected(0); }
-
-static inline uint32_t tud_midi_available (void) { return tud_midi_n_available(0, 0); }
-static inline char tud_midi_read_char (void) { return tud_midi_n_read_char(0, 0); }
-static inline uint32_t tud_midi_read (void* buffer, uint32_t bufsize) { return tud_midi_n_read(0, 0, buffer, bufsize); }
-static inline void tud_midi_read_flush (void) { tud_midi_n_read_flush(0, 0); }
-static inline char tud_midi_peek (int pos) { return tud_midi_n_peek(0, 0, pos); }
-
-static inline uint32_t tud_midi_write_char (char ch) { return tud_midi_n_write_char(0, ch); }
-static inline uint32_t tud_midi_write (uint8_t jack_id, void const* buffer, uint32_t bufsize) { return tud_midi_n_write(0, jack_id, buffer, bufsize); }
-static inline bool tud_midi_write_flush (void) { return tud_midi_n_write_flush(0); }
+static inline bool tud_midi_connected (void);
+static inline uint32_t tud_midi_available (void);
+static inline uint32_t tud_midi_read (void* buffer, uint32_t bufsize);
+static inline void tud_midi_read_flush (void);
+static inline uint32_t tud_midi_write (uint8_t jack_id, void const* buffer, uint32_t bufsize);
+static inline bool tud_midi_write_flush (void);
//--------------------------------------------------------------------+
-// APPLICATION CALLBACK API (WEAK is optional)
+// Application Callback API (weak is optional)
//--------------------------------------------------------------------+
TU_ATTR_WEAK void tud_midi_rx_cb(uint8_t itf);
//--------------------------------------------------------------------+
+// Application API (Interface0) Implementation
+//--------------------------------------------------------------------+
+static inline bool tud_midi_connected (void)
+{
+ return tud_midi_n_connected(0);
+}
+
+static inline uint32_t tud_midi_available (void)
+{
+ return tud_midi_n_available(0, 0);
+}
+
+static inline uint32_t tud_midi_read (void* buffer, uint32_t bufsize)
+{
+ return tud_midi_n_read(0, 0, buffer, bufsize);
+}
+
+static inline void tud_midi_read_flush (void)
+{
+ tud_midi_n_read_flush(0, 0);
+}
+
+static inline uint32_t tud_midi_write (uint8_t jack_id, void const* buffer, uint32_t bufsize)
+{
+ return tud_midi_n_write(0, jack_id, buffer, bufsize);
+}
+
+static inline bool tud_midi_write_flush (void)
+{
+ return tud_midi_n_write_flush(0);
+}
+
+//--------------------------------------------------------------------+
// Internal Class Driver API
//--------------------------------------------------------------------+
void midid_init (void);
|