Updating AVR abstraction to be compatible with ARM, nearly ready for ARM files

[kiibohd-controller.git] / Debug / print / print.c

diff --git a/Debug/print/print.c b/Debug/print/print.c
index 2952c149202672db93ba5fada63f864bb08698d5..04590adab2e8f58e8e83a3c8b4e84a83ec97c544 100644 (file)
--- a/Debug/print/print.c
+++ b/Debug/print/print.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011 by Jacob Alexander
+/* Copyright (C) 2011-2013 by Jacob Alexander
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -34,8 +34,17 @@
 // USB HID String Output
 void usb_debug_putstr( char* s )
 {
+#if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_) // AVR
        while ( *s != '\0' )
                usb_debug_putchar( *s++ );
+#elif defined(_mk20dx128_) // ARM
+       // Count characters until NULL character, then send the amount counted
+       uint32_t count = 0;
+       while ( s[count] != '\0' )
+               count++;
+
+       usb_serial_write( s, count );
+#endif
 }
 
 // Multiple string Output
@@ -64,6 +73,7 @@ void usb_debug_putstrs( char* first, ... )
 // Print a constant string
 void _print(const char *s)
 {
+#if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_) // AVR
        char c;
 
        // Acquire the character from flash, and print it, as long as it's not NULL
@@ -74,6 +84,9 @@ void _print(const char *s)
                        usb_debug_putchar('\r');
                usb_debug_putchar(c);
        }
+#elif defined(_mk20dx128_) // ARM
+       usb_debug_putstr( (char*)s );
+#endif
 }