32-device, 8-bit CSR bus

This commit is contained in:
Sebastien Bourdeauducq 2011-12-17 15:54:42 +01:00
parent 1b3edd07ca
commit bb21f7584a
2 changed files with 9 additions and 9 deletions

View File

@ -17,7 +17,7 @@ class Inst:
("csr_we", self.bus.we_i), ("csr_we", self.bus.we_i),
("csr_di", self.bus.d_i), ("csr_di", self.bus.d_i),
("uart_rx", self.rx)], ("uart_rx", self.rx)],
[("csr_addr", Constant(csr_addr, BV(4))), [("csr_addr", Constant(csr_addr, BV(5))),
("clk_freq", clk_freq), ("clk_freq", clk_freq),
("baud", baud), ("baud", baud),
("break_en_default", break_en_default)], ("break_en_default", break_en_default)],

View File

@ -1,6 +1,6 @@
/* /*
* Milkymist SoC * Milkymist SoC
* Copyright (C) 2007, 2008, 2009, 2010 Sebastien Bourdeauducq * Copyright (C) 2007, 2008, 2009, 2010, 2011 Sebastien Bourdeauducq
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -16,7 +16,7 @@
*/ */
module uart #( module uart #(
parameter csr_addr = 4'h0, parameter csr_addr = 5'h0,
parameter clk_freq = 100000000, parameter clk_freq = 100000000,
parameter baud = 115200, parameter baud = 115200,
parameter break_en_default = 1'b0 parameter break_en_default = 1'b0
@ -26,8 +26,8 @@ module uart #(
input [13:0] csr_a, input [13:0] csr_a,
input csr_we, input csr_we,
input [31:0] csr_di, input [7:0] csr_di,
output reg [31:0] csr_do, output reg [7:0] csr_do,
output irq, output irq,
@ -67,11 +67,11 @@ assign uart_tx = thru_en ? uart_rx : uart_tx_transceiver;
assign break = break_en & break_transceiver; assign break = break_en & break_transceiver;
/* CSR interface */ /* CSR interface */
wire csr_selected = csr_a[13:10] == csr_addr; wire csr_selected = csr_a[13:9] == csr_addr;
assign irq = (tx_event & tx_irq_en) | (rx_event & rx_irq_en); assign irq = (tx_event & tx_irq_en) | (rx_event & rx_irq_en);
assign tx_data = csr_di[7:0]; assign tx_data = csr_di;
assign tx_wr = csr_selected & csr_we & (csr_a[2:0] == 3'b000); assign tx_wr = csr_selected & csr_we & (csr_a[2:0] == 3'b000);
parameter default_divisor = clk_freq/baud/16; parameter default_divisor = clk_freq/baud/16;
@ -111,7 +111,7 @@ always @(posedge sys_clk) begin
if(csr_selected) begin if(csr_selected) begin
case(csr_a[2:0]) case(csr_a[2:0])
3'b000: csr_do <= rx_data; 3'b000: csr_do <= rx_data;
3'b001: csr_do <= divisor; // TODO 3'b001: csr_do <= divisor;
3'b010: csr_do <= {tx_event, rx_event, thre}; 3'b010: csr_do <= {tx_event, rx_event, thre};
3'b011: csr_do <= {thru_en, tx_irq_en, rx_irq_en}; 3'b011: csr_do <= {thru_en, tx_irq_en, rx_irq_en};
3'b100: csr_do <= {break_en}; 3'b100: csr_do <= {break_en};
@ -119,7 +119,7 @@ always @(posedge sys_clk) begin
if(csr_we) begin if(csr_we) begin
case(csr_a[2:0]) case(csr_a[2:0])
3'b000:; /* handled by transceiver */ 3'b000:; /* handled by transceiver */
3'b001: divisor <= csr_di[15:0]; // TODO 3'b001: divisor <= csr_di[15:0];
3'b010: begin 3'b010: begin
/* write one to clear */ /* write one to clear */
if(csr_di[1]) if(csr_di[1])