Changeset 38f2eef in avrstuff

Timestamp:

Jul 31, 2010, 9:36:19 AM (14 years ago)

Author:

Adrien Destugues <pulkomandy@…>

Branches:

main

Children:

bb69525

Parents:

08d5388

Message:

Amiga_keybaord : add non-blocking function to get a char when it's ready.

git-svn-id: ​svn://pulkomandy.tk/avrstuff@8 c6672c3c-f6b6-47f9-9001-1fd6b12fecbe

Location:

libs

Files:

• amiga_keyboard/amiga_keyboard.c (modified) (2 diffs)
• amiga_keyboard/amiga_keyboard.h (modified) (1 diff)
• usart/usart.h (modified) (1 diff)

libs/amiga_keyboard/amiga_keyboard.c

@@ -10 +10 @@
 #include <util/delay.h>
 
+#include "amiga_keyboard.h"
 #include "keymap.h"
 
@@ -107 +108 @@
 
 
-uint8_t ak_read_scancode(){
+uint8_t ak_wait_scancode(){
         while(!char_waiting);
+        return ak_read_scancode();
+}
 
-        while (AK_PORT & (1<<AK_CLK) == 0);
+
+uint8_t ak_read_scancode() {
+        while ((AK_PORT & (1<<AK_CLK)) == 0);
         _delay_us(30);
         acknowledge_char();

libs/amiga_keyboard/amiga_keyboard.h

@@ -5 +5 @@
 #include <inttypes.h>
 
+extern volatile uint8_t char_waiting;
 
 void ak_init_keyboard();
         // Call this to set up the I/O pins
+uint8_t ak_wait_scancode();
+        // Wait for a char to come from the keyboard 
 uint8_t ak_read_scancode();
-        // Wait for a char to come from the keyboard 
+        // Get char from keyboard. Only call this if char_waiting  is set !
 char ak_scancode_to_ascii(uint8_t);
         // Convert a keycode to a printable ASCII char

libs/usart/usart.h

@@ -3 +3 @@
  * Distributed under the terms of the MIT Licence */
 
+#include <stdint.h>
+
 void USARTInit(uint16_t ubrr_value);
 void USARTWriteChar(char data);