Merged usb midi code into current libusbmaster

+ merge fixes

Signed-off-by: Amir Hammad <amir.hammad@hotmail.com>

2 files changed, 54 insertions, 0 deletions

diff --git a/include/usbh_config.h b/include/usbh_config.h
index 1b60954..4fa38cb 100644
--- a/include/usbh_config.h
+++ b/include/usbh_config.h
@@ -43,6 +43,12 @@
 
 #define USBH_HID_MOUSE_BUFFER		(32)
 
+// MIDI
+// Maximal number of midi devices connected to whatever hub
+#define USBH_AC_MIDI_MAX_DEVICES	(4)
+
+#define USBH_AC_MIDI_BUFFER 	(64)
+
 // Gamepad XBOX
 #define USBH_GP_XBOX_MAX_DEVICES	(2)
 
diff --git a/include/usbh_driver_ac_midi.h b/include/usbh_driver_ac_midi.h
new file mode 100644
index 0000000..7b006a9
--- /dev/null
+++ b/include/usbh_driver_ac_midi.h
@@ -0,0 +1,48 @@
+/*
+ * This file is part of the libusbhost library
+ * hosted at http://github.com/libusbhost/libusbhost
+ *
+ * Copyright (C) 2016 Amir Hammad <amir.hammad@hotmail.com>
+ *
+ *
+ * libusbhost is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef USBH_DRIVER_AC_MIDI_
+#define USBH_DRIVER_AC_MIDI_
+
+#include "usbh_hubbed.h"
+
+#include <stdint.h>
+
+BEGIN_DECLS
+
+struct _midi_config {
+	void (*read_callback)(int device_id, uint8_t *data);
+	void (*notify_connected)(int device_id);
+	void (*notify_disconnected)(int device_id);
+};
+typedef struct _midi_config midi_config_t;
+
+typedef void (*midi_write_callback_t)(uint8_t);
+
+void midi_driver_init(const midi_config_t *config);
+void usbh_midi_write(uint8_t device_id, const void *data, uint32_t length, midi_write_callback_t callback);
+
+extern const usbh_dev_driver_t usbh_midi_driver;
+
+END_DECLS
+
+#endif