summaryrefslogtreecommitdiff
path: root/usb-midi/usb-midi.c
diff options
context:
space:
mode:
Diffstat (limited to 'usb-midi/usb-midi.c')
-rw-r--r--usb-midi/usb-midi.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/usb-midi/usb-midi.c b/usb-midi/usb-midi.c
index 7b8d68c..6339646 100644
--- a/usb-midi/usb-midi.c
+++ b/usb-midi/usb-midi.c
@@ -27,6 +27,9 @@
#include <avr/power.h>
#include <stdio.h>
+#include "serialio.h"
+#include "led.h"
+
/*
LUFA Library
Copyright (C) Dean Camera, 2012.
@@ -37,7 +40,6 @@
#include <LUFA/Version.h>
#include <LUFA/Drivers/USB/USB.h>
#include "lufa-descriptor-midi.h"
-#include "LUFA/Drivers/Peripheral/Serial.h"
/** LUFA MIDI Class driver interface configuration and state information. This structure is
* passed to all MIDI Class driver functions, so that multiple instances of the same class
@@ -78,8 +80,6 @@ void EVENT_USB_Device_ControlRequest(void)
#include "util.h"
#include "led.h"
-static FILE serial_stream;
-
#define KEY_PIN PINA
#define KEY_PORT PORTA
#define KEY_DDR DDRA
@@ -101,11 +101,7 @@ int main(void)
cpu_init();
led_init();
key_init();
-
- Serial_Init(38400, 0);
- Serial_CreateStream(&serial_stream);
- stdin = stdout = stderr = &serial_stream;
-
+ serialio_init(38400, 0);
USB_Init();
sei();