add keyboard input via UART

This commit is contained in:
bunnie 2021-04-16 04:11:25 +08:00
parent 1378203427
commit ac40075140
8 changed files with 299 additions and 118 deletions

View file

@ -3,7 +3,7 @@
<device schemaVersion="1.1" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="CMSIS-SVD.xsd" > <device schemaVersion="1.1" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="CMSIS-SVD.xsd" >
<vendor>litex</vendor> <vendor>litex</vendor>
<name>SOC</name> <name>SOC</name>
<description><![CDATA[Litex SoC 2021-04-15 17:50:22]]></description> <description><![CDATA[Litex SoC 2021-04-16 03:02:27]]></description>
<addressUnitBits>8</addressUnitBits> <addressUnitBits>8</addressUnitBits>
<width>32</width> <width>32</width>
@ -1070,10 +1070,10 @@ register to disable individual events.]]></description>
<register> <register>
<name>GIT_GITREV</name> <name>GIT_GITREV</name>
<description><![CDATA[First 32-bits of the git revision. This documentation was built from git rev <description><![CDATA[First 32-bits of the git revision. This documentation was built from git rev
``79edd899``, so this value is 2045630617, which should be enough to check out ``d2990a8c``, so this value is 3533245068, which should be enough to check out
the exact git version used to build this firmware.]]></description> the exact git version used to build this firmware.]]></description>
<addressOffset>0x0014</addressOffset> <addressOffset>0x0014</addressOffset>
<resetValue>0x79edd899</resetValue> <resetValue>0xd2990a8c</resetValue>
<size>32</size> <size>32</size>
<fields> <fields>
<field> <field>
@ -1090,7 +1090,7 @@ the exact git version used to build this firmware.]]></description>
is ``1``, then the repository this was built from has one additional commit is ``1``, then the repository this was built from has one additional commit
beyond the tag indicated in `MAJOR`, `MINOR`, and `REVISION`.]]></description> beyond the tag indicated in `MAJOR`, `MINOR`, and `REVISION`.]]></description>
<addressOffset>0x0018</addressOffset> <addressOffset>0x0018</addressOffset>
<resetValue>0x16</resetValue> <resetValue>0x17</resetValue>
<size>32</size> <size>32</size>
<fields> <fields>
<field> <field>
@ -2584,10 +2584,32 @@ checked]]></description>
<baseAddress>0xF0014000</baseAddress> <baseAddress>0xF0014000</baseAddress>
<groupName>KEYBOARD</groupName> <groupName>KEYBOARD</groupName>
<registers> <registers>
<register>
<name>UART_CHAR</name>
<addressOffset>0x0000</addressOffset>
<resetValue>0x00</resetValue>
<size>32</size>
<fields>
<field>
<name>char</name>
<msb>7</msb>
<bitRange>[7:0]</bitRange>
<lsb>0</lsb>
<description><![CDATA[character value being injected]]></description>
</field>
<field>
<name>stb</name>
<msb>8</msb>
<bitRange>[8:8]</bitRange>
<lsb>8</lsb>
<description><![CDATA[current strobe value (for debugging)]]></description>
</field>
</fields>
</register>
<register> <register>
<name>ROW0DAT</name> <name>ROW0DAT</name>
<description><![CDATA[Column data for the given row]]></description> <description><![CDATA[Column data for the given row]]></description>
<addressOffset>0x0000</addressOffset> <addressOffset>0x0004</addressOffset>
<resetValue>0x00</resetValue> <resetValue>0x00</resetValue>
<size>32</size> <size>32</size>
<fields> <fields>
@ -2602,7 +2624,7 @@ checked]]></description>
<register> <register>
<name>ROW1DAT</name> <name>ROW1DAT</name>
<description><![CDATA[Column data for the given row]]></description> <description><![CDATA[Column data for the given row]]></description>
<addressOffset>0x0004</addressOffset> <addressOffset>0x0008</addressOffset>
<resetValue>0x00</resetValue> <resetValue>0x00</resetValue>
<size>32</size> <size>32</size>
<fields> <fields>
@ -2617,7 +2639,7 @@ checked]]></description>
<register> <register>
<name>ROW2DAT</name> <name>ROW2DAT</name>
<description><![CDATA[Column data for the given row]]></description> <description><![CDATA[Column data for the given row]]></description>
<addressOffset>0x0008</addressOffset> <addressOffset>0x000c</addressOffset>
<resetValue>0x00</resetValue> <resetValue>0x00</resetValue>
<size>32</size> <size>32</size>
<fields> <fields>
@ -2632,7 +2654,7 @@ checked]]></description>
<register> <register>
<name>ROW3DAT</name> <name>ROW3DAT</name>
<description><![CDATA[Column data for the given row]]></description> <description><![CDATA[Column data for the given row]]></description>
<addressOffset>0x000c</addressOffset> <addressOffset>0x0010</addressOffset>
<resetValue>0x00</resetValue> <resetValue>0x00</resetValue>
<size>32</size> <size>32</size>
<fields> <fields>
@ -2647,7 +2669,7 @@ checked]]></description>
<register> <register>
<name>ROW4DAT</name> <name>ROW4DAT</name>
<description><![CDATA[Column data for the given row]]></description> <description><![CDATA[Column data for the given row]]></description>
<addressOffset>0x0010</addressOffset> <addressOffset>0x0014</addressOffset>
<resetValue>0x00</resetValue> <resetValue>0x00</resetValue>
<size>32</size> <size>32</size>
<fields> <fields>
@ -2662,7 +2684,7 @@ checked]]></description>
<register> <register>
<name>ROW5DAT</name> <name>ROW5DAT</name>
<description><![CDATA[Column data for the given row]]></description> <description><![CDATA[Column data for the given row]]></description>
<addressOffset>0x0014</addressOffset> <addressOffset>0x0018</addressOffset>
<resetValue>0x00</resetValue> <resetValue>0x00</resetValue>
<size>32</size> <size>32</size>
<fields> <fields>
@ -2677,7 +2699,7 @@ checked]]></description>
<register> <register>
<name>ROW6DAT</name> <name>ROW6DAT</name>
<description><![CDATA[Column data for the given row]]></description> <description><![CDATA[Column data for the given row]]></description>
<addressOffset>0x0018</addressOffset> <addressOffset>0x001c</addressOffset>
<resetValue>0x00</resetValue> <resetValue>0x00</resetValue>
<size>32</size> <size>32</size>
<fields> <fields>
@ -2692,7 +2714,7 @@ checked]]></description>
<register> <register>
<name>ROW7DAT</name> <name>ROW7DAT</name>
<description><![CDATA[Column data for the given row]]></description> <description><![CDATA[Column data for the given row]]></description>
<addressOffset>0x001c</addressOffset> <addressOffset>0x0020</addressOffset>
<resetValue>0x00</resetValue> <resetValue>0x00</resetValue>
<size>32</size> <size>32</size>
<fields> <fields>
@ -2707,7 +2729,7 @@ checked]]></description>
<register> <register>
<name>ROW8DAT</name> <name>ROW8DAT</name>
<description><![CDATA[Column data for the given row]]></description> <description><![CDATA[Column data for the given row]]></description>
<addressOffset>0x0020</addressOffset> <addressOffset>0x0024</addressOffset>
<resetValue>0x00</resetValue> <resetValue>0x00</resetValue>
<size>32</size> <size>32</size>
<fields> <fields>
@ -2721,8 +2743,8 @@ checked]]></description>
</register> </register>
<register> <register>
<name>EV_STATUS</name> <name>EV_STATUS</name>
<description><![CDATA[Triggered every time there is a difference in the row state]]></description> <description><![CDATA[Key injection request received]]></description>
<addressOffset>0x0024</addressOffset> <addressOffset>0x0028</addressOffset>
<resetValue>0x00</resetValue> <resetValue>0x00</resetValue>
<size>32</size> <size>32</size>
<fields> <fields>
@ -2733,12 +2755,19 @@ checked]]></description>
<lsb>0</lsb> <lsb>0</lsb>
<description><![CDATA[Level of the ``keypressed`` event]]></description> <description><![CDATA[Level of the ``keypressed`` event]]></description>
</field> </field>
<field>
<name>inject</name>
<msb>1</msb>
<bitRange>[1:1]</bitRange>
<lsb>1</lsb>
<description><![CDATA[Level of the ``inject`` event]]></description>
</field>
</fields> </fields>
</register> </register>
<register> <register>
<name>EV_PENDING</name> <name>EV_PENDING</name>
<description><![CDATA[Triggered every time there is a difference in the row state]]></description> <description><![CDATA[Key injection request received]]></description>
<addressOffset>0x0028</addressOffset> <addressOffset>0x002c</addressOffset>
<resetValue>0x00</resetValue> <resetValue>0x00</resetValue>
<size>32</size> <size>32</size>
<fields> <fields>
@ -2749,12 +2778,19 @@ checked]]></description>
<lsb>0</lsb> <lsb>0</lsb>
<description><![CDATA[Triggered every time there is a difference in the row state]]></description> <description><![CDATA[Triggered every time there is a difference in the row state]]></description>
</field> </field>
<field>
<name>inject</name>
<msb>1</msb>
<bitRange>[1:1]</bitRange>
<lsb>1</lsb>
<description><![CDATA[Key injection request received]]></description>
</field>
</fields> </fields>
</register> </register>
<register> <register>
<name>EV_ENABLE</name> <name>EV_ENABLE</name>
<description><![CDATA[Triggered every time there is a difference in the row state]]></description> <description><![CDATA[Key injection request received]]></description>
<addressOffset>0x002c</addressOffset> <addressOffset>0x0030</addressOffset>
<resetValue>0x00</resetValue> <resetValue>0x00</resetValue>
<size>32</size> <size>32</size>
<fields> <fields>
@ -2765,13 +2801,20 @@ checked]]></description>
<lsb>0</lsb> <lsb>0</lsb>
<description><![CDATA[Write a ``1`` to enable the ``keypressed`` Event]]></description> <description><![CDATA[Write a ``1`` to enable the ``keypressed`` Event]]></description>
</field> </field>
<field>
<name>inject</name>
<msb>1</msb>
<bitRange>[1:1]</bitRange>
<lsb>1</lsb>
<description><![CDATA[Write a ``1`` to enable the ``inject`` Event]]></description>
</field>
</fields> </fields>
</register> </register>
<register> <register>
<name>ROWCHANGE</name> <name>ROWCHANGE</name>
<description><![CDATA[The rows that changed at the point of interrupt generation. Does not update <description><![CDATA[The rows that changed at the point of interrupt generation. Does not update
again until the interrupt is serviced.]]></description> again until the interrupt is serviced.]]></description>
<addressOffset>0x0030</addressOffset> <addressOffset>0x0034</addressOffset>
<resetValue>0x00</resetValue> <resetValue>0x00</resetValue>
<size>32</size> <size>32</size>
<fields> <fields>
@ -2786,7 +2829,7 @@ again until the interrupt is serviced.]]></description>
</registers> </registers>
<addressBlock> <addressBlock>
<offset>0</offset> <offset>0</offset>
<size>0x34</size> <size>0x38</size>
<usage>registers</usage> <usage>registers</usage>
</addressBlock> </addressBlock>
<interrupt> <interrupt>
@ -2795,15 +2838,51 @@ again until the interrupt is serviced.]]></description>
</interrupt> </interrupt>
</peripheral> </peripheral>
<peripheral> <peripheral>
<name>SEED</name> <name>KEYINJECT</name>
<baseAddress>0xF0015000</baseAddress> <baseAddress>0xF0015000</baseAddress>
<groupName>KEYINJECT</groupName>
<registers>
<register>
<name>UART_CHAR</name>
<addressOffset>0x0000</addressOffset>
<resetValue>0x00</resetValue>
<size>32</size>
<fields>
<field>
<name>char</name>
<msb>7</msb>
<bitRange>[7:0]</bitRange>
<lsb>0</lsb>
<description><![CDATA[character value to inject. Automatically raises an interrupt upon write. There
is no interlock or FIFO buffering on this, so you can lose characters if you
inject too fast.]]></description>
</field>
<field>
<name>disable</name>
<msb>8</msb>
<bitRange>[8:8]</bitRange>
<lsb>8</lsb>
<description><![CDATA[writing a 1 permanently disables the block, until the next cold boot]]></description>
</field>
</fields>
</register>
</registers>
<addressBlock>
<offset>0</offset>
<size>0x4</size>
<usage>registers</usage>
</addressBlock>
</peripheral>
<peripheral>
<name>SEED</name>
<baseAddress>0xF0016000</baseAddress>
<groupName>SEED</groupName> <groupName>SEED</groupName>
<registers> <registers>
<register> <register>
<name>SEED1</name> <name>SEED1</name>
<description><![CDATA[Bits 32-63 of `SEED_SEED`. Seed used for the build]]></description> <description><![CDATA[Bits 32-63 of `SEED_SEED`. Seed used for the build]]></description>
<addressOffset>0x0000</addressOffset> <addressOffset>0x0000</addressOffset>
<resetValue>0x35b7f4fa</resetValue> <resetValue>0x5b50bb74</resetValue>
<size>32</size> <size>32</size>
<fields> <fields>
<field> <field>
@ -2818,7 +2897,7 @@ again until the interrupt is serviced.]]></description>
<name>SEED0</name> <name>SEED0</name>
<description><![CDATA[Bits 0-31 of `SEED_SEED`.]]></description> <description><![CDATA[Bits 0-31 of `SEED_SEED`.]]></description>
<addressOffset>0x0004</addressOffset> <addressOffset>0x0004</addressOffset>
<resetValue>0x10dd44b4</resetValue> <resetValue>0x1b383b56</resetValue>
<size>32</size> <size>32</size>
<fields> <fields>
<field> <field>
@ -2838,7 +2917,7 @@ again until the interrupt is serviced.]]></description>
</peripheral> </peripheral>
<peripheral> <peripheral>
<name>KEYROM</name> <name>KEYROM</name>
<baseAddress>0xF0016000</baseAddress> <baseAddress>0xF0017000</baseAddress>
<groupName>KEYROM</groupName> <groupName>KEYROM</groupName>
<registers> <registers>
<register> <register>
@ -2880,7 +2959,7 @@ again until the interrupt is serviced.]]></description>
</peripheral> </peripheral>
<peripheral> <peripheral>
<name>AUDIO</name> <name>AUDIO</name>
<baseAddress>0xF0017000</baseAddress> <baseAddress>0xF0018000</baseAddress>
<groupName>AUDIO</groupName> <groupName>AUDIO</groupName>
<registers> <registers>
<register> <register>
@ -3252,7 +3331,7 @@ I2S_FORMAT.I2S_STANDARD is I2S standard]]></description>
</peripheral> </peripheral>
<peripheral> <peripheral>
<name>TRNG_KERNEL</name> <name>TRNG_KERNEL</name>
<baseAddress>0xF0018000</baseAddress> <baseAddress>0xF0019000</baseAddress>
<groupName>TRNG_KERNEL</groupName> <groupName>TRNG_KERNEL</groupName>
<registers> <registers>
<register> <register>
@ -3388,7 +3467,7 @@ I2S_FORMAT.I2S_STANDARD is I2S standard]]></description>
</peripheral> </peripheral>
<peripheral> <peripheral>
<name>TRNG_SERVER</name> <name>TRNG_SERVER</name>
<baseAddress>0xF0019000</baseAddress> <baseAddress>0xF001A000</baseAddress>
<groupName>TRNG_SERVER</groupName> <groupName>TRNG_SERVER</groupName>
<registers> <registers>
<register> <register>
@ -3720,7 +3799,7 @@ to max field size]]></description>
</peripheral> </peripheral>
<peripheral> <peripheral>
<name>TRNG</name> <name>TRNG</name>
<baseAddress>0xF001A000</baseAddress> <baseAddress>0xF001B000</baseAddress>
<groupName>TRNG</groupName> <groupName>TRNG</groupName>
<registers> <registers>
<register> <register>
@ -4033,7 +4112,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]></description>
</peripheral> </peripheral>
<peripheral> <peripheral>
<name>SHA512</name> <name>SHA512</name>
<baseAddress>0xF001B000</baseAddress> <baseAddress>0xF001C000</baseAddress>
<groupName>SHA512</groupName> <groupName>SHA512</groupName>
<registers> <registers>
<register> <register>
@ -4528,7 +4607,7 @@ in bits]]></description>
</peripheral> </peripheral>
<peripheral> <peripheral>
<name>ENGINE</name> <name>ENGINE</name>
<baseAddress>0xF001C000</baseAddress> <baseAddress>0xF001D000</baseAddress>
<groupName>ENGINE</groupName> <groupName>ENGINE</groupName>
<registers> <registers>
<register> <register>
@ -4757,7 +4836,7 @@ exactly reflects the binary layout of an Engine instruction.]]></description>
</peripheral> </peripheral>
<peripheral> <peripheral>
<name>JTAG</name> <name>JTAG</name>
<baseAddress>0xF001D000</baseAddress> <baseAddress>0xF001E000</baseAddress>
<groupName>JTAG</groupName> <groupName>JTAG</groupName>
<registers> <registers>
<register> <register>
@ -4815,7 +4894,7 @@ exactly reflects the binary layout of an Engine instruction.]]></description>
</peripheral> </peripheral>
<peripheral> <peripheral>
<name>WDT</name> <name>WDT</name>
<baseAddress>0xF001E000</baseAddress> <baseAddress>0xF001F000</baseAddress>
<groupName>WDT</groupName> <groupName>WDT</groupName>
<registers> <registers>
<register> <register>
@ -4975,7 +5054,7 @@ register to disable individual events.]]></description>
</peripheral> </peripheral>
<peripheral> <peripheral>
<name>IDENTIFIER_MEM</name> <name>IDENTIFIER_MEM</name>
<baseAddress>0xF001F000</baseAddress> <baseAddress>0xF0020000</baseAddress>
<groupName>IDENTIFIER_MEM</groupName> <groupName>IDENTIFIER_MEM</groupName>
<registers> <registers>
<register> <register>
@ -5002,7 +5081,7 @@ register to disable individual events.]]></description>
</peripheral> </peripheral>
<peripheral> <peripheral>
<name>TIMER0</name> <name>TIMER0</name>
<baseAddress>0xF0020000</baseAddress> <baseAddress>0xF0021000</baseAddress>
<groupName>TIMER0</groupName> <groupName>TIMER0</groupName>
<registers> <registers>
<register> <register>

View file

@ -174,8 +174,8 @@ pub(crate) enum Opcode {
/// set chording interval (how long to wait for all keydowns to happen before interpreting as a chord), in ms (for braille keyboards) /// set chording interval (how long to wait for all keydowns to happen before interpreting as a chord), in ms (for braille keyboards)
SetChordInterval, //(u32), SetChordInterval, //(u32),
/// used by host mode emulation to inject keys /// used by host mode emulation and debug UART to inject keys
HostModeInjectKey, //(char), InjectKey, //(char),
/// used by the interrupt handler to transfer results to the main loop /// used by the interrupt handler to transfer results to the main loop
HandlerTrigger, HandlerTrigger,

View file

@ -65,7 +65,7 @@ impl Keyboard {
#[cfg(not(target_os = "none"))] #[cfg(not(target_os = "none"))]
pub fn hostmode_inject_key(&self, c: char) { pub fn hostmode_inject_key(&self, c: char) {
send_message(self.conn, send_message(self.conn,
Message::new_scalar(Opcode::HostModeInjectKey.to_usize().unwrap(), Message::new_scalar(Opcode::InjectKey.to_usize().unwrap(),
c as u32 as usize, 0, 0, 0 c as u32 as usize, 0, 0, 0
)).unwrap(); )).unwrap();
} }

View file

@ -215,12 +215,21 @@ mod implementation {
fn handle_kbd(_irq_no: usize, arg: *mut usize) { fn handle_kbd(_irq_no: usize, arg: *mut usize) {
let kbd = unsafe { &mut *(arg as *mut Keyboard) }; let kbd = unsafe { &mut *(arg as *mut Keyboard) };
if kbd.csr.rf(utra::keyboard::EV_PENDING_KEYPRESSED) != 0 {
kbd.new_state = kbd.kbd_getcodes(); kbd.new_state = kbd.kbd_getcodes();
kbd.csr.wfo(utra::keyboard::EV_PENDING_KEYPRESSED, 1); // clear the interrupt kbd.csr.wfo(utra::keyboard::EV_PENDING_KEYPRESSED, 1); // clear the interrupt
xous::try_send_message(kbd.conn, xous::try_send_message(kbd.conn,
xous::Message::new_scalar(Opcode::HandlerTrigger.to_usize().unwrap(), 0, 0, 0, 0)).ok(); xous::Message::new_scalar(Opcode::HandlerTrigger.to_usize().unwrap(), 0, 0, 0, 0)).ok();
} }
if kbd.csr.rf(utra::keyboard::EV_PENDING_INJECT) != 0 {
let c = kbd.csr.rf(utra::keyboard::UART_CHAR_CHAR);
kbd.csr.wfo(utra::keyboard::EV_PENDING_INJECT, 1); // clear the interrupt
xous::try_send_message(kbd.conn,
xous::Message::new_scalar(Opcode::InjectKey.to_usize().unwrap(), c as _, 0, 0, 0)
).ok();
}
}
impl Keyboard { impl Keyboard {
pub fn new(sid: xous::SID) -> Keyboard { pub fn new(sid: xous::SID) -> Keyboard {
@ -241,7 +250,7 @@ mod implementation {
new_state: RowColVec::new(), new_state: RowColVec::new(),
last_state: RowColVec::new(), last_state: RowColVec::new(),
ticktimer, ticktimer,
map: KeyMap::Qwerty, map: KeyMap::Braille,
delay: 500, delay: 500,
rate: 20, rate: 20,
shift_down: false, shift_down: false,
@ -262,9 +271,11 @@ mod implementation {
(&mut kbd) as *mut Keyboard as *mut usize, (&mut kbd) as *mut Keyboard as *mut usize,
) )
.expect("couldn't claim irq"); .expect("couldn't claim irq");
kbd.csr.wfo(utra::keyboard::EV_PENDING_KEYPRESSED, 1); // clear in case it's pending for some reason kbd.csr.wo(utra::keyboard::EV_PENDING, kbd.csr.r(utra::keyboard::EV_PENDING)); // clear in case it's pending for some reason
kbd.csr.wfo(utra::keyboard::EV_ENABLE_KEYPRESSED, 1); kbd.csr.wo(utra::keyboard::EV_ENABLE,
kbd.csr.ms(utra::keyboard::EV_ENABLE_KEYPRESSED, 1) |
kbd.csr.ms(utra::keyboard::EV_ENABLE_INJECT, 1)
);
log::trace!("hardware initialized"); log::trace!("hardware initialized");
kbd kbd
@ -389,21 +400,18 @@ mod implementation {
self.chord[rc.r as usize][rc.c as usize] = true; self.chord[rc.r as usize][rc.c as usize] = true;
} }
} }
if let Some(kus) = &keyups { log::trace!("self.chord: {:?}", self.chord);
for &rc in kus.iter() {
self.chord[rc.r as usize][rc.c as usize] = false;
}
}
let mut keystates: Vec<char, U4> = Vec::new(); let mut keystates: Vec<char, U4> = Vec::new();
if self.chord_active || keydowns.is_some() { if self.chord_active || keydowns.is_some() {
let now = self.ticktimer.elapsed_ms(); let now = self.ticktimer.elapsed_ms();
if !self.chord_active && keydowns.is_some() { if !self.chord_active && keydowns.is_some() {
log::trace!("chord_active set");
self.chord_active = true; self.chord_active = true;
self.chord_timestamp = now; self.chord_timestamp = now;
} else if self.chord_active && ((now - self.chord_timestamp) >= self.chord_interval as u64) { } else if self.chord_active && ((now - self.chord_timestamp) >= self.chord_interval as u64) {
log::trace!("interpreting chords");
// extract chord state // extract chord state
/* /*
keyboard: keyboard:
@ -427,6 +435,7 @@ mod implementation {
keycode |= 1 << i; keycode |= 1 << i;
} }
} }
log::trace!("keycode: 0x{:x}", keycode);
let keychar = match keycode { let keychar = match keycode {
0b000_001 => 'a', 0b000_001 => 'a',
0b000_011 => 'b', 0b000_011 => 'b',
@ -487,9 +496,15 @@ mod implementation {
if func { keystates.push('🏁').unwrap(); } if func { keystates.push('🏁').unwrap(); }
} }
} }
if let Some(kus) = &keyups {
for &rc in kus.iter() {
self.chord[rc.r as usize][rc.c as usize] = false;
}
}
// not sure if this is the right way to handle keyups, but let's try it. // not sure if this is the right way to handle keyups, but let's try it.
if keyups.is_some() { if keyups.is_some() {
self.chord_active = false; self.chord_active = false;
log::trace!("chord_active going false");
} }
keystates keystates
@ -776,7 +791,7 @@ fn send_rawstates(cb_conns: &mut [Option<CID>; 16], krs: &KeyRawStates) {
fn xmain() -> ! { fn xmain() -> ! {
use crate::implementation::Keyboard; use crate::implementation::Keyboard;
log_server::init_wait().unwrap(); log_server::init_wait().unwrap();
log::set_max_level(log::LevelFilter::Info); log::set_max_level(log::LevelFilter::Trace);
info!("my PID is {}", xous::process::id()); info!("my PID is {}", xous::process::id());
let xns = xous_names::XousNames::new().unwrap(); let xns = xous_names::XousNames::new().unwrap();
@ -834,9 +849,7 @@ fn xmain() -> ! {
Some(Opcode::SetChordInterval) => msg_scalar_unpack!(msg, delay, _, _, _, { Some(Opcode::SetChordInterval) => msg_scalar_unpack!(msg, delay, _, _, _, {
kbd.set_chord_interval(delay as u32); kbd.set_chord_interval(delay as u32);
}), }),
Some(Opcode::HostModeInjectKey) => msg_scalar_unpack!(msg, _k, _, _, _, { Some(Opcode::InjectKey) => msg_scalar_unpack!(msg, _k, _, _, _, {
#[cfg(not(target_os = "none"))]
{
let key = if let Some(a) = core::char::from_u32(_k as u32) { let key = if let Some(a) = core::char::from_u32(_k as u32) {
a a
} else { } else {
@ -860,7 +873,6 @@ fn xmain() -> ! {
} }
} }
} }
}
}), }),
Some(Opcode::HandlerTrigger) => { Some(Opcode::HandlerTrigger) => {
let rawstates = kbd.update(); let rawstates = kbd.update();

View file

@ -19,7 +19,7 @@ utralib = {path = "../../utralib"}
[features] [features]
debugprint = [] # adding this allocates the UART for debugging the logger debugprint = [] # adding this allocates the UART for debugging the logger
logging = [] # adding this allocates the UART for logging of Xous logging = [] # adding this allocates the hardware UART for console interactions
#default = [] #default = []
default = ["logging"] default = ["logging"]
# default = ["debugprint", "logging"] # default = ["debugprint", "logging"]

View file

@ -119,11 +119,20 @@ mod implementation {
println!("Process: map success!"); println!("Process: map success!");
crate::debug::DEFAULT.enable_rx(); crate::debug::DEFAULT.enable_rx();
let inject_mem = xous::syscall::map_memory(
xous::MemoryAddress::new(utra::keyinject::HW_KEYINJECT_BASE),
None,
4096,
xous::MemoryFlags::R | xous::MemoryFlags::W,
)
.expect("couldn't map keyinjection CSR range");
println!("Note: character injection via console UART is enabled.");
println!("Allocating IRQ..."); println!("Allocating IRQ...");
xous::syscall::claim_interrupt( xous::syscall::claim_interrupt(
utra::console::CONSOLE_IRQ, utra::console::CONSOLE_IRQ,
handle_irq, handle_irq,
core::ptr::null_mut::<usize>(), inject_mem.as_mut_ptr() as *mut usize,
) )
.expect("couldn't claim interrupt"); .expect("couldn't claim interrupt");
println!("Claimed IRQ {}", utra::console::CONSOLE_IRQ); println!("Claimed IRQ {}", utra::console::CONSOLE_IRQ);
@ -143,12 +152,14 @@ mod implementation {
} }
} }
fn handle_irq(irq_no: usize, arg: *mut usize) { fn handle_irq(_irq_no: usize, arg: *mut usize) {
if cfg!(feature = "logging") { if cfg!(feature = "logging") {
print!("Handling IRQ {} (arg: {:08x}): ", irq_no, arg as usize); let mut inject_csr = CSR::new(arg as *mut u32);
//print!("Handling IRQ {} (arg: {:08x}): ", irq_no, arg as usize);
while let Some(c) = crate::debug::DEFAULT.getc() { while let Some(c) = crate::debug::DEFAULT.getc() {
print!("0x{:02x}", c); //print!("0x{:02x} ", c);
inject_csr.wfo(utra::keyinject::UART_CHAR_CHAR, c as u32);
} }
println!(); println!();
} }

View file

@ -3,7 +3,7 @@
<device schemaVersion="1.1" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="CMSIS-SVD.xsd" > <device schemaVersion="1.1" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="CMSIS-SVD.xsd" >
<vendor>litex</vendor> <vendor>litex</vendor>
<name>SOC</name> <name>SOC</name>
<description><![CDATA[Litex SoC 2021-04-15 17:50:22]]></description> <description><![CDATA[Litex SoC 2021-04-16 03:02:27]]></description>
<addressUnitBits>8</addressUnitBits> <addressUnitBits>8</addressUnitBits>
<width>32</width> <width>32</width>
@ -1070,10 +1070,10 @@ register to disable individual events.]]></description>
<register> <register>
<name>GIT_GITREV</name> <name>GIT_GITREV</name>
<description><![CDATA[First 32-bits of the git revision. This documentation was built from git rev <description><![CDATA[First 32-bits of the git revision. This documentation was built from git rev
``79edd899``, so this value is 2045630617, which should be enough to check out ``d2990a8c``, so this value is 3533245068, which should be enough to check out
the exact git version used to build this firmware.]]></description> the exact git version used to build this firmware.]]></description>
<addressOffset>0x0014</addressOffset> <addressOffset>0x0014</addressOffset>
<resetValue>0x79edd899</resetValue> <resetValue>0xd2990a8c</resetValue>
<size>32</size> <size>32</size>
<fields> <fields>
<field> <field>
@ -1090,7 +1090,7 @@ the exact git version used to build this firmware.]]></description>
is ``1``, then the repository this was built from has one additional commit is ``1``, then the repository this was built from has one additional commit
beyond the tag indicated in `MAJOR`, `MINOR`, and `REVISION`.]]></description> beyond the tag indicated in `MAJOR`, `MINOR`, and `REVISION`.]]></description>
<addressOffset>0x0018</addressOffset> <addressOffset>0x0018</addressOffset>
<resetValue>0x16</resetValue> <resetValue>0x17</resetValue>
<size>32</size> <size>32</size>
<fields> <fields>
<field> <field>
@ -2584,10 +2584,32 @@ checked]]></description>
<baseAddress>0xF0014000</baseAddress> <baseAddress>0xF0014000</baseAddress>
<groupName>KEYBOARD</groupName> <groupName>KEYBOARD</groupName>
<registers> <registers>
<register>
<name>UART_CHAR</name>
<addressOffset>0x0000</addressOffset>
<resetValue>0x00</resetValue>
<size>32</size>
<fields>
<field>
<name>char</name>
<msb>7</msb>
<bitRange>[7:0]</bitRange>
<lsb>0</lsb>
<description><![CDATA[character value being injected]]></description>
</field>
<field>
<name>stb</name>
<msb>8</msb>
<bitRange>[8:8]</bitRange>
<lsb>8</lsb>
<description><![CDATA[current strobe value (for debugging)]]></description>
</field>
</fields>
</register>
<register> <register>
<name>ROW0DAT</name> <name>ROW0DAT</name>
<description><![CDATA[Column data for the given row]]></description> <description><![CDATA[Column data for the given row]]></description>
<addressOffset>0x0000</addressOffset> <addressOffset>0x0004</addressOffset>
<resetValue>0x00</resetValue> <resetValue>0x00</resetValue>
<size>32</size> <size>32</size>
<fields> <fields>
@ -2602,7 +2624,7 @@ checked]]></description>
<register> <register>
<name>ROW1DAT</name> <name>ROW1DAT</name>
<description><![CDATA[Column data for the given row]]></description> <description><![CDATA[Column data for the given row]]></description>
<addressOffset>0x0004</addressOffset> <addressOffset>0x0008</addressOffset>
<resetValue>0x00</resetValue> <resetValue>0x00</resetValue>
<size>32</size> <size>32</size>
<fields> <fields>
@ -2617,7 +2639,7 @@ checked]]></description>
<register> <register>
<name>ROW2DAT</name> <name>ROW2DAT</name>
<description><![CDATA[Column data for the given row]]></description> <description><![CDATA[Column data for the given row]]></description>
<addressOffset>0x0008</addressOffset> <addressOffset>0x000c</addressOffset>
<resetValue>0x00</resetValue> <resetValue>0x00</resetValue>
<size>32</size> <size>32</size>
<fields> <fields>
@ -2632,7 +2654,7 @@ checked]]></description>
<register> <register>
<name>ROW3DAT</name> <name>ROW3DAT</name>
<description><![CDATA[Column data for the given row]]></description> <description><![CDATA[Column data for the given row]]></description>
<addressOffset>0x000c</addressOffset> <addressOffset>0x0010</addressOffset>
<resetValue>0x00</resetValue> <resetValue>0x00</resetValue>
<size>32</size> <size>32</size>
<fields> <fields>
@ -2647,7 +2669,7 @@ checked]]></description>
<register> <register>
<name>ROW4DAT</name> <name>ROW4DAT</name>
<description><![CDATA[Column data for the given row]]></description> <description><![CDATA[Column data for the given row]]></description>
<addressOffset>0x0010</addressOffset> <addressOffset>0x0014</addressOffset>
<resetValue>0x00</resetValue> <resetValue>0x00</resetValue>
<size>32</size> <size>32</size>
<fields> <fields>
@ -2662,7 +2684,7 @@ checked]]></description>
<register> <register>
<name>ROW5DAT</name> <name>ROW5DAT</name>
<description><![CDATA[Column data for the given row]]></description> <description><![CDATA[Column data for the given row]]></description>
<addressOffset>0x0014</addressOffset> <addressOffset>0x0018</addressOffset>
<resetValue>0x00</resetValue> <resetValue>0x00</resetValue>
<size>32</size> <size>32</size>
<fields> <fields>
@ -2677,7 +2699,7 @@ checked]]></description>
<register> <register>
<name>ROW6DAT</name> <name>ROW6DAT</name>
<description><![CDATA[Column data for the given row]]></description> <description><![CDATA[Column data for the given row]]></description>
<addressOffset>0x0018</addressOffset> <addressOffset>0x001c</addressOffset>
<resetValue>0x00</resetValue> <resetValue>0x00</resetValue>
<size>32</size> <size>32</size>
<fields> <fields>
@ -2692,7 +2714,7 @@ checked]]></description>
<register> <register>
<name>ROW7DAT</name> <name>ROW7DAT</name>
<description><![CDATA[Column data for the given row]]></description> <description><![CDATA[Column data for the given row]]></description>
<addressOffset>0x001c</addressOffset> <addressOffset>0x0020</addressOffset>
<resetValue>0x00</resetValue> <resetValue>0x00</resetValue>
<size>32</size> <size>32</size>
<fields> <fields>
@ -2707,7 +2729,7 @@ checked]]></description>
<register> <register>
<name>ROW8DAT</name> <name>ROW8DAT</name>
<description><![CDATA[Column data for the given row]]></description> <description><![CDATA[Column data for the given row]]></description>
<addressOffset>0x0020</addressOffset> <addressOffset>0x0024</addressOffset>
<resetValue>0x00</resetValue> <resetValue>0x00</resetValue>
<size>32</size> <size>32</size>
<fields> <fields>
@ -2721,8 +2743,8 @@ checked]]></description>
</register> </register>
<register> <register>
<name>EV_STATUS</name> <name>EV_STATUS</name>
<description><![CDATA[Triggered every time there is a difference in the row state]]></description> <description><![CDATA[Key injection request received]]></description>
<addressOffset>0x0024</addressOffset> <addressOffset>0x0028</addressOffset>
<resetValue>0x00</resetValue> <resetValue>0x00</resetValue>
<size>32</size> <size>32</size>
<fields> <fields>
@ -2733,12 +2755,19 @@ checked]]></description>
<lsb>0</lsb> <lsb>0</lsb>
<description><![CDATA[Level of the ``keypressed`` event]]></description> <description><![CDATA[Level of the ``keypressed`` event]]></description>
</field> </field>
<field>
<name>inject</name>
<msb>1</msb>
<bitRange>[1:1]</bitRange>
<lsb>1</lsb>
<description><![CDATA[Level of the ``inject`` event]]></description>
</field>
</fields> </fields>
</register> </register>
<register> <register>
<name>EV_PENDING</name> <name>EV_PENDING</name>
<description><![CDATA[Triggered every time there is a difference in the row state]]></description> <description><![CDATA[Key injection request received]]></description>
<addressOffset>0x0028</addressOffset> <addressOffset>0x002c</addressOffset>
<resetValue>0x00</resetValue> <resetValue>0x00</resetValue>
<size>32</size> <size>32</size>
<fields> <fields>
@ -2749,12 +2778,19 @@ checked]]></description>
<lsb>0</lsb> <lsb>0</lsb>
<description><![CDATA[Triggered every time there is a difference in the row state]]></description> <description><![CDATA[Triggered every time there is a difference in the row state]]></description>
</field> </field>
<field>
<name>inject</name>
<msb>1</msb>
<bitRange>[1:1]</bitRange>
<lsb>1</lsb>
<description><![CDATA[Key injection request received]]></description>
</field>
</fields> </fields>
</register> </register>
<register> <register>
<name>EV_ENABLE</name> <name>EV_ENABLE</name>
<description><![CDATA[Triggered every time there is a difference in the row state]]></description> <description><![CDATA[Key injection request received]]></description>
<addressOffset>0x002c</addressOffset> <addressOffset>0x0030</addressOffset>
<resetValue>0x00</resetValue> <resetValue>0x00</resetValue>
<size>32</size> <size>32</size>
<fields> <fields>
@ -2765,13 +2801,20 @@ checked]]></description>
<lsb>0</lsb> <lsb>0</lsb>
<description><![CDATA[Write a ``1`` to enable the ``keypressed`` Event]]></description> <description><![CDATA[Write a ``1`` to enable the ``keypressed`` Event]]></description>
</field> </field>
<field>
<name>inject</name>
<msb>1</msb>
<bitRange>[1:1]</bitRange>
<lsb>1</lsb>
<description><![CDATA[Write a ``1`` to enable the ``inject`` Event]]></description>
</field>
</fields> </fields>
</register> </register>
<register> <register>
<name>ROWCHANGE</name> <name>ROWCHANGE</name>
<description><![CDATA[The rows that changed at the point of interrupt generation. Does not update <description><![CDATA[The rows that changed at the point of interrupt generation. Does not update
again until the interrupt is serviced.]]></description> again until the interrupt is serviced.]]></description>
<addressOffset>0x0030</addressOffset> <addressOffset>0x0034</addressOffset>
<resetValue>0x00</resetValue> <resetValue>0x00</resetValue>
<size>32</size> <size>32</size>
<fields> <fields>
@ -2786,7 +2829,7 @@ again until the interrupt is serviced.]]></description>
</registers> </registers>
<addressBlock> <addressBlock>
<offset>0</offset> <offset>0</offset>
<size>0x34</size> <size>0x38</size>
<usage>registers</usage> <usage>registers</usage>
</addressBlock> </addressBlock>
<interrupt> <interrupt>
@ -2795,15 +2838,51 @@ again until the interrupt is serviced.]]></description>
</interrupt> </interrupt>
</peripheral> </peripheral>
<peripheral> <peripheral>
<name>SEED</name> <name>KEYINJECT</name>
<baseAddress>0xF0015000</baseAddress> <baseAddress>0xF0015000</baseAddress>
<groupName>KEYINJECT</groupName>
<registers>
<register>
<name>UART_CHAR</name>
<addressOffset>0x0000</addressOffset>
<resetValue>0x00</resetValue>
<size>32</size>
<fields>
<field>
<name>char</name>
<msb>7</msb>
<bitRange>[7:0]</bitRange>
<lsb>0</lsb>
<description><![CDATA[character value to inject. Automatically raises an interrupt upon write. There
is no interlock or FIFO buffering on this, so you can lose characters if you
inject too fast.]]></description>
</field>
<field>
<name>disable</name>
<msb>8</msb>
<bitRange>[8:8]</bitRange>
<lsb>8</lsb>
<description><![CDATA[writing a 1 permanently disables the block, until the next cold boot]]></description>
</field>
</fields>
</register>
</registers>
<addressBlock>
<offset>0</offset>
<size>0x4</size>
<usage>registers</usage>
</addressBlock>
</peripheral>
<peripheral>
<name>SEED</name>
<baseAddress>0xF0016000</baseAddress>
<groupName>SEED</groupName> <groupName>SEED</groupName>
<registers> <registers>
<register> <register>
<name>SEED1</name> <name>SEED1</name>
<description><![CDATA[Bits 32-63 of `SEED_SEED`. Seed used for the build]]></description> <description><![CDATA[Bits 32-63 of `SEED_SEED`. Seed used for the build]]></description>
<addressOffset>0x0000</addressOffset> <addressOffset>0x0000</addressOffset>
<resetValue>0x35b7f4fa</resetValue> <resetValue>0x5b50bb74</resetValue>
<size>32</size> <size>32</size>
<fields> <fields>
<field> <field>
@ -2818,7 +2897,7 @@ again until the interrupt is serviced.]]></description>
<name>SEED0</name> <name>SEED0</name>
<description><![CDATA[Bits 0-31 of `SEED_SEED`.]]></description> <description><![CDATA[Bits 0-31 of `SEED_SEED`.]]></description>
<addressOffset>0x0004</addressOffset> <addressOffset>0x0004</addressOffset>
<resetValue>0x10dd44b4</resetValue> <resetValue>0x1b383b56</resetValue>
<size>32</size> <size>32</size>
<fields> <fields>
<field> <field>
@ -2838,7 +2917,7 @@ again until the interrupt is serviced.]]></description>
</peripheral> </peripheral>
<peripheral> <peripheral>
<name>KEYROM</name> <name>KEYROM</name>
<baseAddress>0xF0016000</baseAddress> <baseAddress>0xF0017000</baseAddress>
<groupName>KEYROM</groupName> <groupName>KEYROM</groupName>
<registers> <registers>
<register> <register>
@ -2880,7 +2959,7 @@ again until the interrupt is serviced.]]></description>
</peripheral> </peripheral>
<peripheral> <peripheral>
<name>AUDIO</name> <name>AUDIO</name>
<baseAddress>0xF0017000</baseAddress> <baseAddress>0xF0018000</baseAddress>
<groupName>AUDIO</groupName> <groupName>AUDIO</groupName>
<registers> <registers>
<register> <register>
@ -3252,7 +3331,7 @@ I2S_FORMAT.I2S_STANDARD is I2S standard]]></description>
</peripheral> </peripheral>
<peripheral> <peripheral>
<name>TRNG_KERNEL</name> <name>TRNG_KERNEL</name>
<baseAddress>0xF0018000</baseAddress> <baseAddress>0xF0019000</baseAddress>
<groupName>TRNG_KERNEL</groupName> <groupName>TRNG_KERNEL</groupName>
<registers> <registers>
<register> <register>
@ -3388,7 +3467,7 @@ I2S_FORMAT.I2S_STANDARD is I2S standard]]></description>
</peripheral> </peripheral>
<peripheral> <peripheral>
<name>TRNG_SERVER</name> <name>TRNG_SERVER</name>
<baseAddress>0xF0019000</baseAddress> <baseAddress>0xF001A000</baseAddress>
<groupName>TRNG_SERVER</groupName> <groupName>TRNG_SERVER</groupName>
<registers> <registers>
<register> <register>
@ -3720,7 +3799,7 @@ to max field size]]></description>
</peripheral> </peripheral>
<peripheral> <peripheral>
<name>TRNG</name> <name>TRNG</name>
<baseAddress>0xF001A000</baseAddress> <baseAddress>0xF001B000</baseAddress>
<groupName>TRNG</groupName> <groupName>TRNG</groupName>
<registers> <registers>
<register> <register>
@ -4033,7 +4112,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]></description>
</peripheral> </peripheral>
<peripheral> <peripheral>
<name>SHA512</name> <name>SHA512</name>
<baseAddress>0xF001B000</baseAddress> <baseAddress>0xF001C000</baseAddress>
<groupName>SHA512</groupName> <groupName>SHA512</groupName>
<registers> <registers>
<register> <register>
@ -4528,7 +4607,7 @@ in bits]]></description>
</peripheral> </peripheral>
<peripheral> <peripheral>
<name>ENGINE</name> <name>ENGINE</name>
<baseAddress>0xF001C000</baseAddress> <baseAddress>0xF001D000</baseAddress>
<groupName>ENGINE</groupName> <groupName>ENGINE</groupName>
<registers> <registers>
<register> <register>
@ -4757,7 +4836,7 @@ exactly reflects the binary layout of an Engine instruction.]]></description>
</peripheral> </peripheral>
<peripheral> <peripheral>
<name>JTAG</name> <name>JTAG</name>
<baseAddress>0xF001D000</baseAddress> <baseAddress>0xF001E000</baseAddress>
<groupName>JTAG</groupName> <groupName>JTAG</groupName>
<registers> <registers>
<register> <register>
@ -4815,7 +4894,7 @@ exactly reflects the binary layout of an Engine instruction.]]></description>
</peripheral> </peripheral>
<peripheral> <peripheral>
<name>WDT</name> <name>WDT</name>
<baseAddress>0xF001E000</baseAddress> <baseAddress>0xF001F000</baseAddress>
<groupName>WDT</groupName> <groupName>WDT</groupName>
<registers> <registers>
<register> <register>
@ -4975,7 +5054,7 @@ register to disable individual events.]]></description>
</peripheral> </peripheral>
<peripheral> <peripheral>
<name>IDENTIFIER_MEM</name> <name>IDENTIFIER_MEM</name>
<baseAddress>0xF001F000</baseAddress> <baseAddress>0xF0020000</baseAddress>
<groupName>IDENTIFIER_MEM</groupName> <groupName>IDENTIFIER_MEM</groupName>
<registers> <registers>
<register> <register>
@ -5002,7 +5081,7 @@ register to disable individual events.]]></description>
</peripheral> </peripheral>
<peripheral> <peripheral>
<name>TIMER0</name> <name>TIMER0</name>
<baseAddress>0xF0020000</baseAddress> <baseAddress>0xF0021000</baseAddress>
<groupName>TIMER0</groupName> <groupName>TIMER0</groupName>
<registers> <registers>
<register> <register>

View file

@ -2,7 +2,7 @@
/* /*
A list of descriptions of servers ("names") that are used as keys by the xous-names server A list of descriptions of servers ("names") that are used as keys by the xous-names server
to refer to servers that are not statically bound into the kernel to refer to servers that are not statically bound into the kernel, or have a special debug purpose.
*/ */
pub const SERVER_NAME_IME_PLUGIN_SHELL: &str = "_IME shell plugin_"; pub const SERVER_NAME_IME_PLUGIN_SHELL: &str = "_IME shell plugin_";