receive HID from firmware

Author: nand2mario

src/gbatang_top.sv

@@ -425,6 +425,8 @@ controller_ds2 ds2 (
 wire [11:0] joy_btns_gba = joy_btns;
 `endif
 
+wire [11:0] hid1, hid2;
+
 gba_joypad joypad (
     .mclk(clk16), /*.fclk(clk33),*/ `GB_BUS_PORTS_INST, .IRP_Joypad(IRP_Joypad),
     .KeyA(joy_btns_gba[8]), .KeyB(joy_btns_gba[0]), .KeySelect(joy_btns_gba[2]), .KeyStart(joy_btns_gba[3]), 
@@ -444,7 +446,7 @@ wire overlay;
 wire [10:0] overlay_x;
 wire [14:0] overlay_color;
 wire [9:0] overlay_y;
-assign joy_btns_gba = overlay ? 0 : joy_btns;
+assign joy_btns_gba = overlay ? 0 : joy_btns | hid1 | hid2;
 
 gba2hdmi video (
 	.clk(clk50), .resetn(resetn),
@@ -473,6 +475,7 @@ iosys_bl616 #(.CORE_ID(3), .COLOR_LOGO(15'b01111_01100_10101), .FREQ(16_650_000)
 
     .overlay(overlay), .overlay_x(overlay_x), .overlay_y(overlay_y), .overlay_color(overlay_color),
     .joy1(joy_btns), .joy2(12'b0),
+    .hid1(hid1), .hid2(hid2),
 
 `ifdef TEST_LOADER
     .rom_loading(), .rom_do(), .rom_do_valid(), 

src/iosys/iosys_bl616.v

@@ -23,8 +23,10 @@ module iosys_bl616 #(
     input [7:0] overlay_x,          // 0-255
     input [7:0] overlay_y,          // 0-223
     output [14:0] overlay_color,    // BGR5
-    input [11:0] joy1,              // joystick 1: (R L X A RT LT DN UP START SELECT Y B)
-    input [11:0] joy2,              // joystick 2
+    input [11:0] joy1,              // DS2/SNES joystick 1: (R L X A RT LT DN UP START SELECT Y B)
+    input [11:0] joy2,              // DS2/SNES joystick 2
+    output reg [15:0] hid1,         // USB HID joystick 1
+    output reg [15:0] hid2,         // USB HID joystick 2
 
     // ROM loading interface
     output reg [7:0] rom_loading,   // 0-to-1 loading starts, 1-to-0 loading is finished
@@ -87,29 +89,6 @@ async_transmitter #(
 );
 assign tx_ready = ~tx_busy;
 
-// uart_rx_fractional #(
-//     .DIV_NUM(CLK_FREQ/1000),
-//     .DIV_DEN(BAUD_RATE/1000)
-// ) uart_receiver (
-//     .clk(clk),
-//     .resetn(resetn),
-//     .rx(uart_rx),
-//     .data(rx_data),
-//     .valid(rx_valid)
-// );
-
-// uart_tx_fractional #(
-//     .DIV_NUM(CLK_FREQ/1000),
-//     .DIV_DEN(BAUD_RATE/1000)
-// ) uart_transmitter (
-//     .clk(clk),
-//     .resetn(resetn),
-//     .tx(uart_tx),
-//     .data(tx_data),
-//     .valid(tx_valid),
-//     .ready(tx_ready)
-// );
-
 // Command processing state machine
 localparam RECV_IDLE = 0;     // waiting for command
 localparam RECV_PARAM = 1;    // receiving parameters
@@ -148,9 +127,10 @@ reg response_ack;
 // 0x06 loading_state[7:0]    set loading state (rom_loading)
 // 0x07 len[23:0] <data>      load len (MSB-first) bytes of data to rom_do
 // 0x08 x[7:0]                turn overlay on/off
+// 0x09 hid1[7:0] hid1[15:8] hid2[7:0] hid2[15:8]     Send USB HID state to FPGA
 //
 // Messages from FPGA to BL616:
-// 0x01 joy1[7:0] joy1[15:8] joy2[7:0] joy2[15:8]     Every 20ms, send joypad state
+// 0x01 joy1[7:0] joy1[15:8] joy2[7:0] joy2[15:8]     Every 20ms, send DS2/SNES joypad state to BL616
 // 0x11 core_id[7:0]          send core ID
 // 0x22 <string>              send null-terminated core config string
 
@@ -179,7 +159,7 @@ always @(posedge clk) begin
                 cmd_reg <= rx_data;
                 if (rx_data == 1 || rx_data == 2)
                     recv_state <= RECV_RESPONSE_REQ;
-                else if (rx_data <= 8)
+                else if (rx_data <= 9)
                     recv_state <= RECV_PARAM;
                 data_cnt <= 0;
             end
@@ -239,6 +219,18 @@ always @(posedge clk) begin
                         overlay_reg <= rx_data[0];
                         recv_state <= RECV_IDLE;    // Single byte command
                     end
+                    9: begin
+                        case (data_cnt)
+                            0: hid1[7:0] <= rx_data;
+                            1: hid1[15:8] <= rx_data;
+                            2: hid2[7:0] <= rx_data;
+                            3: begin
+                                hid2[15:8] <= rx_data;
+                                recv_state <= RECV_IDLE;
+                            end
+                            default: recv_state <= RECV_IDLE;
+                        endcase
+                    end
                     default:
                         recv_state <= RECV_IDLE;
                 endcase