improved anyio and usbio

git-svn-id: https://svn.spreadspace.org/mur.sat@675 7de4ea59-55d0-425e-a1af-a3118ea81d4c

2 files changed, 6 insertions, 15 deletions

diff --git a/software/avr.lib/anyio.c b/software/avr.lib/anyio.c
index 6344d74..1ad4e96 100644
--- a/software/avr.lib/anyio.c
+++ b/software/avr.lib/anyio.c
@@ -68,8 +68,8 @@ void EVENT_USB_Device_ControlRequest(void)
 }
 /* end LUFA CDC-ACM specific definitions*/
 
-FILE usb_stream;
-FILE serial_stream;
+static FILE usb_stream;
+static FILE serial_stream;
 
 void anyio_init(const uint32_t baudrate, const uint8_t doublespeed)
 {
diff --git a/software/avr.lib/usbio.c b/software/avr.lib/usbio.c
index 1107ee4..371f9e7 100644
--- a/software/avr.lib/usbio.c
+++ b/software/avr.lib/usbio.c
@@ -68,22 +68,13 @@ void EVENT_USB_Device_ControlRequest(void)
 }
 /* end LUFA CDC-ACM specific definitions*/
 
-FILE usb_stream;
-FILE dummy_stream;
-
-int dummy_putchar(char DataByte, FILE *Stream)
-{
-	return 0;
-}
-
-int dummy_getchar(FILE *Stream)
-{
-	return 0;
-}
+static int dummy_putchar(char DataByte, FILE *Stream) { return 0; }
+static int dummy_getchar(FILE *Stream) { return 0; }
+static FILE dummy_stream = FDEV_SETUP_STREAM(dummy_putchar, dummy_getchar, _FDEV_SETUP_RW);
+static FILE usb_stream;
 
 void usbio_init(void)
 {
-	dummy_stream = (FILE)FDEV_SETUP_STREAM(dummy_putchar, dummy_getchar, _FDEV_SETUP_RW);
   stdin = stdout = stderr = &dummy_stream;
 
   USB_Init();