di0ib/tmk_keyboard
1
0
Fork 0
Code Releases Activity

core: change API of adb.c to accept device address

Browse Source
This commit is contained in:
tmk 2016-06-04 19:02:41 +09:00
parent 4d9e66baec
commit 230ed4bdef
2 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tmk_core/protocol/adb.c
View File

@ -86,9 +86,9 @@ bool adb_host_psw(void)
* <http://geekhack.org/index.php?topic=14290.msg1068919#msg1068919> * <http://geekhack.org/index.php?topic=14290.msg1068919#msg1068919>
* <http://geekhack.org/index.php?topic=14290.msg1070139#msg1070139> * <http://geekhack.org/index.php?topic=14290.msg1070139#msg1070139>
*/ */
uint16_t adb_host_kbd_recv(void) uint16_t adb_host_kbd_recv(uint8_t addr)
{ {
return adb_host_talk(ADB_ADDR_KEYBOARD, ADB_REG_0); return adb_host_talk(addr, ADB_REG_0);
} }
#ifdef ADB_MOUSE_ENABLE #ifdef ADB_MOUSE_ENABLE
@ -156,11 +156,11 @@ error:
return -n; return -n;
} }
void adb_host_listen(uint8_t cmd, uint8_t data_h, uint8_t data_l) void adb_host_listen(uint8_t addr, uint8_t reg, uint8_t data_h, uint8_t data_l)
{ {
cli(); cli();
attention(); attention();
send_byte(cmd); send_byte((addr<<4) | (ADB_CMD_LISTEN<<2) | reg);
place_bit0(); // Stopbit(0) place_bit0(); // Stopbit(0)
_delay_us(200); // Tlt/Stop to Start _delay_us(200); // Tlt/Stop to Start
place_bit1(); // Startbit(1) place_bit1(); // Startbit(1)
@ -171,12 +171,12 @@ void adb_host_listen(uint8_t cmd, uint8_t data_h, uint8_t data_l)
} }
// send state of LEDs // send state of LEDs
void adb_host_kbd_led(uint8_t led) void adb_host_kbd_led(uint8_t addr, uint8_t led)
{ {
// Addr:Keyboard(0010), Cmd:Listen(10), Register2(10) // Listen Register2
// send upper byte (not used) // upper byte: not used
// send lower byte (bit2: ScrollLock, bit1: CapsLock, bit0: // lower byte: bit2=ScrollLock, bit1=CapsLock, bit0=NumLock
adb_host_listen(0x2A,0,led&0x07); adb_host_listen(addr, 2, 0, led & 0x07);
} }
@ -325,7 +325,7 @@ Commands
bits commands bits commands
------------------------------------------------------ ------------------------------------------------------
- - - - 0 0 0 0 Send Request(reset all devices) - - - - 0 0 0 0 Send Reset(reset all devices)
A A A A 0 0 0 1 Flush(reset a device) A A A A 0 0 0 1 Flush(reset a device)
- - - - 0 0 1 0 Reserved - - - - 0 0 1 0 Reserved
- - - - 0 0 1 1 Reserved - - - - 0 0 1 1 Reserved
@ -440,7 +440,7 @@ Address, Handler ID and bits(Register3)
| | | | +-+-+-+----------------- Address | | | | +-+-+-+----------------- Address
| | | +------------------------- 0 | | | +------------------------- 0
| | +--------------------------- Service request enable(1 = enabled) | | +--------------------------- Service request enable(1 = enabled)
| +----------------------------- Exeptional event(alwyas 1 if not used) | +----------------------------- Exceptional event(alwyas 1 if not used)
+------------------------------- 0 +------------------------------- 0
ADB Bit Cells ADB Bit Cells

26
tmk_core/protocol/adb.h
View File

@ -53,30 +53,40 @@ POSSIBILITY OF SUCH DAMAGE.
/* ADB commands */ /* ADB commands */
// Default Address
#define ADB_ADDR_DONGLE 1
#define ADB_ADDR_KEYBOARD 2 #define ADB_ADDR_KEYBOARD 2
#define ADB_ADDR_MOUSE 3 #define ADB_ADDR_MOUSE 3
#define ADB_ADDR_TABLET 4
#define ADB_ADDR_APPLIANCE 7
// Command Type
#define ADB_CMD_RESET 0
#define ADB_CMD_FLUSH 1
#define ADB_CMD_LISTEN 2 #define ADB_CMD_LISTEN 2
#define ADB_CMD_TALK 3 #define ADB_CMD_TALK 3
// Register
#define ADB_REG_0 0 #define ADB_REG_0 0
#define ADB_REG_1 1 #define ADB_REG_1 1
#define ADB_REG_2 2 #define ADB_REG_2 2
#define ADB_REG_3 3 #define ADB_REG_3 3
/* ADB keyboard handle id */ /* ADB keyboard handler id */
#define ADB_HANDLE_M0116 0x01 #define ADB_HANDLER_M0116 0x01
#define ADB_HANDLE_M0115 0x02 #define ADB_HANDLER_IIGS 0x01
#define ADB_HANDLE_M3501 0x02 #define ADB_HANDLER_M0115 0x02
#define ADB_HANDLE_M1242 0x10 #define ADB_HANDLER_M3501 0x02
#define ADB_HANDLER_M1242_ANSI 0x10
#define ADB_HANDLER_EXTENDED_PROTOCOL 0x03
// ADB host // ADB host
void adb_host_init(void); void adb_host_init(void);
bool adb_host_psw(void); bool adb_host_psw(void);
uint16_t adb_host_kbd_recv(void); uint16_t adb_host_kbd_recv(uint8_t addr);
uint16_t adb_host_mouse_recv(void); uint16_t adb_host_mouse_recv(void);
uint16_t adb_host_talk(uint8_t addr, uint8_t reg); uint16_t adb_host_talk(uint8_t addr, uint8_t reg);
void adb_host_listen(uint8_t cmd, uint8_t data_h, uint8_t data_l); void adb_host_listen(uint8_t addr, uint8_t reg, uint8_t data_h, uint8_t data_l);
void adb_host_kbd_led(uint8_t led); void adb_host_kbd_led(uint8_t addr, uint8_t led);
void adb_mouse_task(void); void adb_mouse_task(void);
void adb_mouse_init(void); void adb_mouse_init(void);