diff --git a/precursors/rom.db b/precursors/rom.db index fa01b8874..57516aeed 100644 --- a/precursors/rom.db +++ b/precursors/rom.db @@ -1,128 +1,128 @@ -KEYROM 0 A SLICE_X36Y50 b'421756f8f8d1662a' -KEYROM 0 B SLICE_X36Y50 b'ae5a85e715ac7e2a' -KEYROM 0 C SLICE_X36Y50 b'44873c07724f9f49' -KEYROM 0 D SLICE_X36Y50 b'9272792b03ca7867' -KEYROM 1 A SLICE_X37Y50 b'fab84cfca11ede2a' -KEYROM 1 B SLICE_X37Y50 b'16a2c9190405f48f' -KEYROM 1 C SLICE_X37Y50 b'ed4b80ac17e0df75' -KEYROM 1 D SLICE_X37Y50 b'85afe5a0b08685aa' -KEYROM 2 A SLICE_X36Y51 b'3efecbd1d8b19485' -KEYROM 2 B SLICE_X36Y51 b'9f86c65af81f866b' -KEYROM 2 C SLICE_X36Y51 b'473bceb73c644545' -KEYROM 2 D SLICE_X36Y51 b'794073ccc983704e' -KEYROM 3 A SLICE_X37Y51 b'b6e17581bba7e057' -KEYROM 3 B SLICE_X37Y51 b'69434b43c05c9670' -KEYROM 3 C SLICE_X37Y51 b'7e884031616748b6' -KEYROM 3 D SLICE_X37Y51 b'c1bb36e7ca470895' -KEYROM 4 A SLICE_X36Y52 b'd10bde8405c7f1ba' -KEYROM 4 B SLICE_X36Y52 b'19a5a4b22af4bc14' -KEYROM 4 C SLICE_X36Y52 b'8eaa65fd7091f530' -KEYROM 4 D SLICE_X36Y52 b'76fbfec480ae2cb0' -KEYROM 5 A SLICE_X37Y52 b'4833163cca5c0c38' -KEYROM 5 B SLICE_X37Y52 b'5d1709acab5cbe11' -KEYROM 5 C SLICE_X37Y52 b'db0837fd62041bc9' -KEYROM 5 D SLICE_X37Y52 b'1c79cfa9eb05d7ba' -KEYROM 6 A SLICE_X36Y53 b'9f30e5d879ea9cdf' -KEYROM 6 B SLICE_X36Y53 b'f00ffbe982790287' -KEYROM 6 C SLICE_X36Y53 b'9bd6ab012d359d1f' -KEYROM 6 D SLICE_X36Y53 b'102b6e972fcad9d5' -KEYROM 7 A SLICE_X37Y53 b'f9f78d6454abd8f2' -KEYROM 7 B SLICE_X37Y53 b'2a2d0dd7eb12d077' -KEYROM 7 C SLICE_X37Y53 b'671a806cfc4f66df' -KEYROM 7 D SLICE_X37Y53 b'3210cedf98e99d96' -KEYROM 8 A SLICE_X36Y54 b'5759d45fd67f253d' -KEYROM 8 B SLICE_X36Y54 b'137050899d65f964' -KEYROM 8 C SLICE_X36Y54 b'1bb313adcc947f25' -KEYROM 8 D SLICE_X36Y54 b'950092520f28b15e' -KEYROM 9 A SLICE_X37Y54 b'5f6bc0a4477052d2' -KEYROM 9 B SLICE_X37Y54 b'd4f9cf0c83888cee' -KEYROM 9 C SLICE_X37Y54 b'6e2e7f233da9221e' -KEYROM 9 D SLICE_X37Y54 b'aa44adcdbfaba157' -KEYROM 10 A SLICE_X36Y55 b'f0095a35fd704458' -KEYROM 10 B SLICE_X36Y55 b'36a9b239b7bd16f0' -KEYROM 10 C SLICE_X36Y55 b'617d2b9f28a2ff45' -KEYROM 10 D SLICE_X36Y55 b'b74b1f3278638848' -KEYROM 11 A SLICE_X37Y55 b'9a2585412671d178' -KEYROM 11 B SLICE_X37Y55 b'a3ca7eaddb067e88' -KEYROM 11 C SLICE_X37Y55 b'27ee7f92af36cfd3' -KEYROM 11 D SLICE_X37Y55 b'c34867e495d89c9a' -KEYROM 12 A SLICE_X36Y56 b'ef56264e4b1870b2' -KEYROM 12 B SLICE_X36Y56 b'1d5f6fb74641af23' -KEYROM 12 C SLICE_X36Y56 b'7afb5baa51afac6a' -KEYROM 12 D SLICE_X36Y56 b'20e888d9611efa9d' -KEYROM 13 A SLICE_X37Y56 b'8804107a66cec3d3' -KEYROM 13 B SLICE_X37Y56 b'b2c890dcb75f30fb' -KEYROM 13 C SLICE_X37Y56 b'78bb97028f20186a' -KEYROM 13 D SLICE_X37Y56 b'c2575616967cfb60' -KEYROM 14 A SLICE_X36Y57 b'cae48cd69aee3815' -KEYROM 14 B SLICE_X36Y57 b'7cf2beb4e00cf757' -KEYROM 14 C SLICE_X36Y57 b'8b4fadfa39f2637b' -KEYROM 14 D SLICE_X36Y57 b'f754529a1653dc3d' -KEYROM 15 A SLICE_X37Y57 b'88b1779f8cc5023f' -KEYROM 15 B SLICE_X37Y57 b'a544f137ab11afd2' -KEYROM 15 C SLICE_X37Y57 b'e05bd7b858cab122' -KEYROM 15 D SLICE_X37Y57 b'c90ca56c470b2b98' -KEYROM 16 A SLICE_X36Y58 b'b6540f773774bacd' -KEYROM 16 B SLICE_X36Y58 b'69d825c84ba32f4b' -KEYROM 16 C SLICE_X36Y58 b'1f233362c06b3ec3' -KEYROM 16 D SLICE_X36Y58 b'db7f3a15ff421ff3' -KEYROM 17 A SLICE_X37Y58 b'6b356911c8ad50f5' -KEYROM 17 B SLICE_X37Y58 b'511a2a7b6a6cfe94' -KEYROM 17 C SLICE_X37Y58 b'fc7d3fe12c7af435' -KEYROM 17 D SLICE_X37Y58 b'd74a5619ae255693' -KEYROM 18 A SLICE_X36Y59 b'438bcc2444d0d551' -KEYROM 18 B SLICE_X36Y59 b'f1338e4e11c3d0c0' -KEYROM 18 C SLICE_X36Y59 b'a3b6949c95311e60' -KEYROM 18 D SLICE_X36Y59 b'eef5d045b195215d' -KEYROM 19 A SLICE_X37Y59 b'e7f27e86a7e08cdb' -KEYROM 19 B SLICE_X37Y59 b'9f33f1bbd25276ed' -KEYROM 19 C SLICE_X37Y59 b'596b5725dfa59a8b' -KEYROM 19 D SLICE_X37Y59 b'343dc25ab9668752' -KEYROM 20 A SLICE_X36Y60 b'7b3e6ed235b3bdba' -KEYROM 20 B SLICE_X36Y60 b'ec6ba9799b3ee836' -KEYROM 20 C SLICE_X36Y60 b'608d83ecfee86575' -KEYROM 20 D SLICE_X36Y60 b'efaeadfa7bfa676b' -KEYROM 21 A SLICE_X37Y60 b'6e2975b76c7ba07f' -KEYROM 21 B SLICE_X37Y60 b'dd7889bfe682e70c' -KEYROM 21 C SLICE_X37Y60 b'f34d0442b29f5cca' -KEYROM 21 D SLICE_X37Y60 b'c166e4f724724715' -KEYROM 22 A SLICE_X36Y61 b'8730b664136b9f58' -KEYROM 22 B SLICE_X36Y61 b'c6df173722641382' -KEYROM 22 C SLICE_X36Y61 b'a66edc5a63e70126' -KEYROM 22 D SLICE_X36Y61 b'c25d24e02d5a7df4' -KEYROM 23 A SLICE_X37Y61 b'b702b026ffaefd2c' -KEYROM 23 B SLICE_X37Y61 b'7e16cf2b5aa4bf4c' -KEYROM 23 C SLICE_X37Y61 b'42873fce9cb7d0e0' -KEYROM 23 D SLICE_X37Y61 b'ee501981d2575ecf' -KEYROM 24 A SLICE_X36Y62 b'cc082770312ef8b7' -KEYROM 24 B SLICE_X36Y62 b'dfa3c3c3ca9a8d57' -KEYROM 24 C SLICE_X36Y62 b'1003afc35336369e' -KEYROM 24 D SLICE_X36Y62 b'e7cdb4a27d0c366b' -KEYROM 25 A SLICE_X37Y62 b'dd12e9756e688232' -KEYROM 25 B SLICE_X37Y62 b'6cffa42e26440096' -KEYROM 25 C SLICE_X37Y62 b'b7f2b88659f094c7' -KEYROM 25 D SLICE_X37Y62 b'5d4f70178c300f5e' -KEYROM 26 A SLICE_X36Y63 b'a8a7d042e513e5f4' -KEYROM 26 B SLICE_X36Y63 b'c240e4b072a6be4f' -KEYROM 26 C SLICE_X36Y63 b'e3bf25ad10becda5' -KEYROM 26 D SLICE_X36Y63 b'f61f6dc0851bda27' -KEYROM 27 A SLICE_X37Y63 b'969b4d34ead9ea58' -KEYROM 27 B SLICE_X37Y63 b'280e664a27e263b2' -KEYROM 27 C SLICE_X37Y63 b'aca8e0322312bc89' -KEYROM 27 D SLICE_X37Y63 b'a21a42f70c2ab3cb' -KEYROM 28 A SLICE_X36Y64 b'2ce5344c87dedec7' -KEYROM 28 B SLICE_X36Y64 b'1d1c29bd777d9b82' -KEYROM 28 C SLICE_X36Y64 b'3f72f33c68929d4a' -KEYROM 28 D SLICE_X36Y64 b'39ee20ba584ebd0f' -KEYROM 29 A SLICE_X37Y64 b'7c508fae99f1f7fe' -KEYROM 29 B SLICE_X37Y64 b'9d4b1622f2003eec' -KEYROM 29 C SLICE_X37Y64 b'f2e37f0d9d235637' -KEYROM 29 D SLICE_X37Y64 b'0dbc1feb3f2627a8' -KEYROM 30 A SLICE_X36Y65 b'46f1504245f7f51d' -KEYROM 30 B SLICE_X36Y65 b'6a1d21ec413a09bb' -KEYROM 30 C SLICE_X36Y65 b'a2bdb8dc9552d79c' -KEYROM 30 D SLICE_X36Y65 b'747ae4b905ca4e75' -KEYROM 31 A SLICE_X37Y65 b'47bb20742224f4d1' -KEYROM 31 B SLICE_X37Y65 b'd3eea2385c090406' -KEYROM 31 C SLICE_X37Y65 b'2c9697f421e2c138' -KEYROM 31 D SLICE_X37Y65 b'9bee0802fd5b39cd' +KEYROM 0 A SLICE_X36Y50 b'df14e1bb410df3a1' +KEYROM 0 B SLICE_X36Y50 b'd04dff21f89ee8bf' +KEYROM 0 C SLICE_X36Y50 b'416c1a28fd83c77b' +KEYROM 0 D SLICE_X36Y50 b'ba0269ba89e641d7' +KEYROM 1 A SLICE_X37Y50 b'9c44df255fd2a5da' +KEYROM 1 B SLICE_X37Y50 b'aea94847e5f2cd0c' +KEYROM 1 C SLICE_X37Y50 b'8b92e766041d2215' +KEYROM 1 D SLICE_X37Y50 b'a0d520564ff78a60' +KEYROM 2 A SLICE_X36Y51 b'f3cb7a1101eeaf6c' +KEYROM 2 B SLICE_X36Y51 b'ab6ac834e19baefc' +KEYROM 2 C SLICE_X36Y51 b'00b12075b2185b18' +KEYROM 2 D SLICE_X36Y51 b'7d4eae2b7c7b0778' +KEYROM 3 A SLICE_X37Y51 b'cc668b73dc5b20ed' +KEYROM 3 B SLICE_X37Y51 b'a5b8b7120edeb93c' +KEYROM 3 C SLICE_X37Y51 b'597f101f0a33972c' +KEYROM 3 D SLICE_X37Y51 b'6469cc5379d26720' +KEYROM 4 A SLICE_X36Y52 b'aeb1bc7732636490' +KEYROM 4 B SLICE_X36Y52 b'eb882878da9c7943' +KEYROM 4 C SLICE_X36Y52 b'71f37802768585ae' +KEYROM 4 D SLICE_X36Y52 b'3e0a50c473a23418' +KEYROM 5 A SLICE_X37Y52 b'bf85b47bebbd4ed0' +KEYROM 5 B SLICE_X37Y52 b'6c3c2429eda490ae' +KEYROM 5 C SLICE_X37Y52 b'1b37ffc31fdfdfcc' +KEYROM 5 D SLICE_X37Y52 b'04a6c3992e50fc67' +KEYROM 6 A SLICE_X36Y53 b'e4d8253303f260ad' +KEYROM 6 B SLICE_X36Y53 b'94213ab1b2d87176' +KEYROM 6 C SLICE_X36Y53 b'd928e7243d13ee32' +KEYROM 6 D SLICE_X36Y53 b'1baf76b1bae5dd35' +KEYROM 7 A SLICE_X37Y53 b'f94f5b910a3adfd5' +KEYROM 7 B SLICE_X37Y53 b'37a5ab15c01e20e4' +KEYROM 7 C SLICE_X37Y53 b'6baa138e51b37fea' +KEYROM 7 D SLICE_X37Y53 b'28270dc201771b62' +KEYROM 8 A SLICE_X36Y54 b'ff84d4a63041c516' +KEYROM 8 B SLICE_X36Y54 b'52918b89290e53ef' +KEYROM 8 C SLICE_X36Y54 b'c6f32dcdec7b8cc9' +KEYROM 8 D SLICE_X36Y54 b'4bf983b124ea3e62' +KEYROM 9 A SLICE_X37Y54 b'c18b0d2924202e43' +KEYROM 9 B SLICE_X37Y54 b'75a403a06a95f69b' +KEYROM 9 C SLICE_X37Y54 b'0e6c4c529690213d' +KEYROM 9 D SLICE_X37Y54 b'105b5014c6ff9172' +KEYROM 10 A SLICE_X36Y55 b'2818d6b10fcc1315' +KEYROM 10 B SLICE_X36Y55 b'332f6d00f603bb50' +KEYROM 10 C SLICE_X36Y55 b'32332a423e3e7c1a' +KEYROM 10 D SLICE_X36Y55 b'b1643077491b5e06' +KEYROM 11 A SLICE_X37Y55 b'361bab4ce8b57fee' +KEYROM 11 B SLICE_X37Y55 b'92edf70b9cfe0098' +KEYROM 11 C SLICE_X37Y55 b'63039a3ecc72f58d' +KEYROM 11 D SLICE_X37Y55 b'733ba57f04b75284' +KEYROM 12 A SLICE_X36Y56 b'765767c682d26569' +KEYROM 12 B SLICE_X36Y56 b'497992efc3776d79' +KEYROM 12 C SLICE_X36Y56 b'7d95ac30fbb5d34b' +KEYROM 12 D SLICE_X36Y56 b'89f54d6c6492b724' +KEYROM 13 A SLICE_X37Y56 b'f5eb153c883b6b6a' +KEYROM 13 B SLICE_X37Y56 b'b97af3b9d2c75292' +KEYROM 13 C SLICE_X37Y56 b'be705ea0031d0e71' +KEYROM 13 D SLICE_X37Y56 b'0dd907c101fddb1e' +KEYROM 14 A SLICE_X36Y57 b'3a773992ffd19035' +KEYROM 14 B SLICE_X36Y57 b'39540ab5ad9029a4' +KEYROM 14 C SLICE_X36Y57 b'fe6a6748030621db' +KEYROM 14 D SLICE_X36Y57 b'037296f110144ae4' +KEYROM 15 A SLICE_X37Y57 b'62e89c33394dcb13' +KEYROM 15 B SLICE_X37Y57 b'a0d90f274ca934b0' +KEYROM 15 C SLICE_X37Y57 b'd3321d7e3d0817f4' +KEYROM 15 D SLICE_X37Y57 b'0f89feb7554feb88' +KEYROM 16 A SLICE_X36Y58 b'6144cb3338715f56' +KEYROM 16 B SLICE_X36Y58 b'e8b7136a67dd63dc' +KEYROM 16 C SLICE_X36Y58 b'1915eb8794f26e06' +KEYROM 16 D SLICE_X36Y58 b'7e06c5e6258396b7' +KEYROM 17 A SLICE_X37Y58 b'1cd1cb5102979c09' +KEYROM 17 B SLICE_X37Y58 b'7e390dd426f32f6b' +KEYROM 17 C SLICE_X37Y58 b'cd796e3604b1f665' +KEYROM 17 D SLICE_X37Y58 b'd6d3a0d503744352' +KEYROM 18 A SLICE_X36Y59 b'7838fefdfeff0caf' +KEYROM 18 B SLICE_X36Y59 b'39937d76a02e55b2' +KEYROM 18 C SLICE_X36Y59 b'a74ce365e488fb5c' +KEYROM 18 D SLICE_X36Y59 b'5ff47e2ad8f8c727' +KEYROM 19 A SLICE_X37Y59 b'24877ab3b82cfb60' +KEYROM 19 B SLICE_X37Y59 b'0997e1bd2730dc92' +KEYROM 19 C SLICE_X37Y59 b'22cb622b3807b997' +KEYROM 19 D SLICE_X37Y59 b'305a1a9722c36348' +KEYROM 20 A SLICE_X36Y60 b'ed417bdc093cc6e5' +KEYROM 20 B SLICE_X36Y60 b'368c101fbe4593f9' +KEYROM 20 C SLICE_X36Y60 b'f524fe658b30c5ff' +KEYROM 20 D SLICE_X36Y60 b'427894ffe12ea152' +KEYROM 21 A SLICE_X37Y60 b'8d6628875ae19e43' +KEYROM 21 B SLICE_X37Y60 b'1e3d36077f35ebed' +KEYROM 21 C SLICE_X37Y60 b'55cbcc5900fbe0fa' +KEYROM 21 D SLICE_X37Y60 b'b3576c48e96b040f' +KEYROM 22 A SLICE_X36Y61 b'0c1baa89112852b0' +KEYROM 22 B SLICE_X36Y61 b'39483bee52dceb4c' +KEYROM 22 C SLICE_X36Y61 b'd9b21bb5703e5abc' +KEYROM 22 D SLICE_X36Y61 b'707e78d4d0a3fd99' +KEYROM 23 A SLICE_X37Y61 b'06b27a972f8fac72' +KEYROM 23 B SLICE_X37Y61 b'5d6a42a77b856df6' +KEYROM 23 C SLICE_X37Y61 b'f48aeab4a59dcd34' +KEYROM 23 D SLICE_X37Y61 b'c210bd1111f5513f' +KEYROM 24 A SLICE_X36Y62 b'5a8d01dc3c48c365' +KEYROM 24 B SLICE_X36Y62 b'550604e502c4b51e' +KEYROM 24 C SLICE_X36Y62 b'196e9d00a1dddb36' +KEYROM 24 D SLICE_X36Y62 b'56fcd1ec8b205a60' +KEYROM 25 A SLICE_X37Y62 b'b278f2eeab6f1eb6' +KEYROM 25 B SLICE_X37Y62 b'daf87a1c092d4d95' +KEYROM 25 C SLICE_X37Y62 b'7e2e704497c71ad4' +KEYROM 25 D SLICE_X37Y62 b'81fe60c9b947f5cc' +KEYROM 26 A SLICE_X36Y63 b'aaf0eab1eb9a4390' +KEYROM 26 B SLICE_X36Y63 b'44b81cf224548463' +KEYROM 26 C SLICE_X36Y63 b'50445f9b117caeaf' +KEYROM 26 D SLICE_X36Y63 b'80ea15490c51a616' +KEYROM 27 A SLICE_X37Y63 b'0c3cd10b73427f91' +KEYROM 27 B SLICE_X37Y63 b'a2d60f9a2e16eff3' +KEYROM 27 C SLICE_X37Y63 b'07a7dd73948f0bf6' +KEYROM 27 D SLICE_X37Y63 b'4e84fc06d10dd094' +KEYROM 28 A SLICE_X36Y64 b'3f371180b689d79c' +KEYROM 28 B SLICE_X36Y64 b'8aab4a1aafd06b10' +KEYROM 28 C SLICE_X36Y64 b'2e2bc7d70388afab' +KEYROM 28 D SLICE_X36Y64 b'f84c176996b25a8a' +KEYROM 29 A SLICE_X37Y64 b'adedccab0cf1047d' +KEYROM 29 B SLICE_X37Y64 b'dc944b65364129e4' +KEYROM 29 C SLICE_X37Y64 b'4c71b98fc479b286' +KEYROM 29 D SLICE_X37Y64 b'9be04f29153ca694' +KEYROM 30 A SLICE_X36Y65 b'aa98cf138633738d' +KEYROM 30 B SLICE_X36Y65 b'fdf766fd0e5a46d0' +KEYROM 30 C SLICE_X36Y65 b'5230ebd643274b37' +KEYROM 30 D SLICE_X36Y65 b'e96126419731faa4' +KEYROM 31 A SLICE_X37Y65 b'29277868d4660ffa' +KEYROM 31 B SLICE_X37Y65 b'e8a0b6dbe77de21c' +KEYROM 31 C SLICE_X37Y65 b'feaacc3708396854' +KEYROM 31 D SLICE_X37Y65 b'a43e6b13f2017b0f' diff --git a/precursors/soc.svd b/precursors/soc.svd index ce3a991d8..2ea2e6aa7 100644 --- a/precursors/soc.svd +++ b/precursors/soc.svd @@ -3,7 +3,7 @@ litex SOC - + 8 32 @@ -3321,7 +3321,7 @@ checked]]> 8 [8:8] 8 - + @@ -3560,11 +3560,19 @@ checked]]> is no interlock or FIFO buffering on this, so you can lose characters if you inject too fast.]]> + + + + DISABLE + 0x0004 + 0x00 + 32 + disable - 8 - [8:8] - 8 + 0 + [0:0] + 0 @@ -3572,7 +3580,7 @@ inject too fast.]]> 0 - 0x4 + 0x8 registers @@ -3585,7 +3593,7 @@ inject too fast.]]> SEED1 0x0000 - 0x22e343a6 + 0x6ef8973c 32 @@ -3600,7 +3608,7 @@ inject too fast.]]> SEED0 0x0004 - 0x19bfcf31 + 0x5df014e4 32 diff --git a/precursors/soc_csr.bin b/precursors/soc_csr.bin index a96841c59..046216ddd 100644 Binary files a/precursors/soc_csr.bin and b/precursors/soc_csr.bin differ diff --git a/services/keyboard/src/main.rs b/services/keyboard/src/main.rs index 3503a3a24..b9b905766 100644 --- a/services/keyboard/src/main.rs +++ b/services/keyboard/src/main.rs @@ -212,6 +212,7 @@ mod implementation { fn handle_kbd(_irq_no: usize, arg: *mut usize) { let kbd = unsafe { &mut *(arg as *mut Keyboard) }; + let pending = kbd.csr.r(utra::keyboard::EV_PENDING); if kbd.csr.rf(utra::keyboard::EV_PENDING_KEYPRESSED) != 0 { // scan the entire key matrix and return the list of keys that are currently // pressed as key codes. If we missed an interrupt, then we missed the key... @@ -228,18 +229,18 @@ mod implementation { } } } - kbd.csr.wfo(utra::keyboard::EV_PENDING_KEYPRESSED, 1); // clear the interrupt - xous::try_send_message(kbd.conn, 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(); + while kbd.csr.rf(utra::keyboard::UART_CHAR_STB) != 0 { + let c = kbd.csr.rf(utra::keyboard::UART_CHAR_CHAR); + xous::try_send_message(kbd.conn, + xous::Message::new_scalar(Opcode::InjectKey.to_usize().unwrap(), c as _, 0, 0, 0) + ).ok(); + } } + kbd.csr.wo(utra::keyboard::EV_PENDING, pending); } /// get the column activation contents of the given row /// row is coded as a binary number, so the result of kbd_rowchange has to be decoded from a binary @@ -312,7 +313,6 @@ mod implementation { kbd.csr.ms(utra::keyboard::EV_ENABLE_KEYPRESSED, 1) | kbd.csr.ms(utra::keyboard::EV_ENABLE_INJECT, 1) ); - log::trace!("hardware initialized"); kbd.susres.push_fixed_value(RegOrField::Reg(utra::keyboard::EV_PENDING), 0xFFFF_FFFF); kbd.susres.push(RegOrField::Reg(utra::keyboard::EV_ENABLE), None); @@ -366,7 +366,7 @@ mod implementation { pub(crate) fn poll(&mut self) { // disable the interrupt while we're polling, to avoid a race condition... - self.csr.wfo(utra::keyboard::EV_ENABLE_KEYPRESSED, 0); + self.csr.rmwf(utra::keyboard::EV_ENABLE_KEYPRESSED, 0); self.new_state.clear(); for r in 0..KBD_ROWS { let cols: u16 = kbd_getrow(self, r as u8); @@ -384,7 +384,7 @@ mod implementation { log::warn!("kbd interrupt was set when we didn't expect it, clearing anyways..."); self.csr.wfo(utra::keyboard::EV_PENDING_KEYPRESSED, 1); } - self.csr.wfo(utra::keyboard::EV_ENABLE_KEYPRESSED, 1); + self.csr.rmwf(utra::keyboard::EV_ENABLE_KEYPRESSED, 1); } pub(crate) fn update(&mut self) -> KeyRawStates { @@ -941,17 +941,18 @@ fn xmain() -> ! { log::warn!("Uninterpreable key sequence, ignoring: 0x{:x}", k); '\u{0000}' }; - log::trace!("got inject key, listener_conn: {:?}", listener_conn); if let Some(conn) = listener_conn { - log::info!("injecting key '{}'({:x})", key, key as u32); // always be noisy about this, it's an exploit path - xous::send_message(conn, - xous::Message::new_scalar(listener_op.unwrap(), - key as u32 as usize, - '\u{0000}' as u32 as usize, - '\u{0000}' as u32 as usize, - '\u{0000}' as u32 as usize, - ) - ).unwrap(); + if key != '\u{0000}' { + log::info!("injecting key '{}'({:x})", key, key as u32); // always be noisy about this, it's an exploit path + xous::send_message(conn, + xous::Message::new_scalar(listener_op.unwrap(), + key as u32 as usize, + '\u{0000}' as u32 as usize, + '\u{0000}' as u32 as usize, + '\u{0000}' as u32 as usize, + ) + ).unwrap(); + } } }), Some(Opcode::HandlerTrigger) => { diff --git a/services/log-server/src/debug.rs b/services/log-server/src/debug.rs index 9b161c546..b13407951 100644 --- a/services/log-server/src/debug.rs +++ b/services/log-server/src/debug.rs @@ -24,6 +24,7 @@ macro_rules! println }); } +#[allow(dead_code)] fn handle_irq(irq_no: usize, arg: *mut usize) { print!("Handling IRQ {} (arg: {:08x}): ", irq_no, arg as usize); @@ -60,12 +61,12 @@ impl Uart { // core::mem::forget(uart); println!("Allocating IRQ..."); - xous::claim_interrupt( + /* xous::claim_interrupt( utra::console::CONSOLE_IRQ, handle_irq, core::ptr::null_mut::(), ) - .expect("unable to allocate IRQ"); + .expect("unable to allocate IRQ"); */ self.enable_rx(); } @@ -84,7 +85,7 @@ impl Uart { let mut uart_csr = CSR::new(unsafe { DEFAULT_UART_ADDR as *mut u32 }); uart_csr.rmwf(utra::uart::EV_ENABLE_RX, 1); } - + #[allow(dead_code)] pub fn getc(&self) -> Option { if unsafe { DEFAULT_UART_ADDR } as usize == 0 { self.map_uart(); diff --git a/services/log-server/src/main.rs b/services/log-server/src/main.rs index 31b3a6f4c..4a5921b5f 100644 --- a/services/log-server/src/main.rs +++ b/services/log-server/src/main.rs @@ -129,9 +129,9 @@ mod implementation { .expect("couldn't map serial port"); unsafe { crate::debug::DEFAULT_UART_ADDR = uart.as_mut_ptr() as _ }; println!("Mapped UART @ {:08x}", uart.as_ptr() as usize); + let mut uart_csr = CSR::new(uart.as_mut_ptr() as *mut u32); println!("Process: map success!"); - crate::debug::DEFAULT.enable_rx(); let inject_mem = xous::syscall::map_memory( xous::MemoryAddress::new(utra::keyinject::HW_KEYINJECT_BASE), @@ -145,11 +145,12 @@ mod implementation { println!("Allocating IRQ..."); xous::syscall::claim_interrupt( utra::console::CONSOLE_IRQ, - handle_irq, + handle_console_irq, inject_mem.as_mut_ptr() as *mut usize, ) .expect("couldn't claim interrupt"); println!("Claimed IRQ {}", utra::console::CONSOLE_IRQ); + uart_csr.rmwf(utra::uart::EV_ENABLE_RX, 1); } Output {} } @@ -166,16 +167,29 @@ mod implementation { } } - fn handle_irq(_irq_no: usize, arg: *mut usize) { + fn handle_console_irq(_irq_no: usize, arg: *mut usize) { if cfg!(feature = "logging") { let mut inject_csr = CSR::new(arg as *mut u32); - //print!("Handling IRQ {} (arg: {:08x}): ", irq_no, arg as usize); + let mut uart_csr = CSR::new(unsafe { crate::debug::DEFAULT_UART_ADDR as *mut u32 }); - while let Some(c) = crate::debug::DEFAULT.getc() { - //print!("0x{:02x} ", c); - inject_csr.wfo(utra::keyinject::UART_CHAR_CHAR, c as u32); + loop { + let maybe_c = match uart_csr.rf(utra::uart::EV_PENDING_RX) { + 0 => None, + ack => { + let c = Some(uart_csr.rf(utra::uart::RXTX_RXTX) as u8); + uart_csr.wfo(utra::uart::EV_PENDING_RX, ack); + c + } + }; + if let Some(c) = maybe_c { + // println!("Inject {}", c); + inject_csr.wfo(utra::keyinject::UART_CHAR_CHAR, (c & 0xff) as u32); + } else { + break; + } } - println!(); + // make sure this doesn't get disabled + uart_csr.rmwf(utra::uart::EV_ENABLE_RX, 1); } } @@ -189,6 +203,8 @@ mod implementation { // Wait until TXFULL is `0` while uart_csr.r(utra::uart::TXFULL) != 0 {} uart_csr.wo(utra::uart::RXTX, c as u32); + + uart_csr.rmwf(utra::uart::EV_ENABLE_RX, 1); } }