diff options
Diffstat (limited to 'tmk_core/protocol/pjrc/main.c')
| -rw-r--r-- | tmk_core/protocol/pjrc/main.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/tmk_core/protocol/pjrc/main.c b/tmk_core/protocol/pjrc/main.c index 45eb17d4c..d16051c5f 100644 --- a/tmk_core/protocol/pjrc/main.c +++ b/tmk_core/protocol/pjrc/main.c | |||
| @@ -1,17 +1,17 @@ | |||
| 1 | /* Keyboard example with debug channel, for Teensy USB Development Board | 1 | /* Keyboard example with debug channel, for Teensy USB Development Board |
| 2 | * http://www.pjrc.com/teensy/usb_keyboard.html | 2 | * http://www.pjrc.com/teensy/usb_keyboard.html |
| 3 | * Copyright (c) 2008 PJRC.COM, LLC | 3 | * Copyright (c) 2008 PJRC.COM, LLC |
| 4 | * | 4 | * |
| 5 | * Permission is hereby granted, free of charge, to any person obtaining a copy | 5 | * Permission is hereby granted, free of charge, to any person obtaining a copy |
| 6 | * of this software and associated documentation files (the "Software"), to deal | 6 | * of this software and associated documentation files (the "Software"), to deal |
| 7 | * in the Software without restriction, including without limitation the rights | 7 | * in the Software without restriction, including without limitation the rights |
| 8 | * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | 8 | * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell |
| 9 | * copies of the Software, and to permit persons to whom the Software is | 9 | * copies of the Software, and to permit persons to whom the Software is |
| 10 | * furnished to do so, subject to the following conditions: | 10 | * furnished to do so, subject to the following conditions: |
| 11 | * | 11 | * |
| 12 | * The above copyright notice and this permission notice shall be included in | 12 | * The above copyright notice and this permission notice shall be included in |
| 13 | * all copies or substantial portions of the Software. | 13 | * all copies or substantial portions of the Software. |
| 14 | * | 14 | * |
| 15 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | 15 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
| 16 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | 16 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
| 17 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | 17 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
| @@ -37,12 +37,9 @@ | |||
| 37 | #include "host.h" | 37 | #include "host.h" |
| 38 | #include "pjrc.h" | 38 | #include "pjrc.h" |
| 39 | 39 | ||
| 40 | #define CPU_PRESCALE(n) (CLKPR = 0x80, CLKPR = (n)) | ||
| 40 | 41 | ||
| 41 | #define CPU_PRESCALE(n) (CLKPR = 0x80, CLKPR = (n)) | 42 | int main(void) { |
| 42 | |||
| 43 | |||
| 44 | int main(void) | ||
| 45 | { | ||
| 46 | // set for 16 MHz clock | 43 | // set for 16 MHz clock |
| 47 | CPU_PRESCALE(0); | 44 | CPU_PRESCALE(0); |
| 48 | 45 | ||
| @@ -52,7 +49,8 @@ int main(void) | |||
| 52 | // If the Teensy is powered without a PC connected to the USB port, | 49 | // If the Teensy is powered without a PC connected to the USB port, |
| 53 | // this will wait forever. | 50 | // this will wait forever. |
| 54 | usb_init(); | 51 | usb_init(); |
| 55 | while (!usb_configured()) /* wait */ ; | 52 | while (!usb_configured()) /* wait */ |
| 53 | ; | ||
| 56 | 54 | ||
| 57 | print_set_sendchar(sendchar); | 55 | print_set_sendchar(sendchar); |
| 58 | 56 | ||
| @@ -69,6 +67,6 @@ int main(void) | |||
| 69 | } | 67 | } |
| 70 | } | 68 | } |
| 71 | 69 | ||
| 72 | keyboard_task(); | 70 | keyboard_task(); |
| 73 | } | 71 | } |
| 74 | } | 72 | } |
