Changeset 9092

Show
Ignore:
Timestamp:
07/31/08 20:16:11
Author:
matt
Message:

changes to match the 1-bit wider full/empty counters in the shortfifo

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • usrp2/trunk/fpga/control_lib/medfifo.v

    r8730 r9092  
    1111     output full, 
    1212     output empty, 
    13      output [3:0] space, 
    14      output [3:0] occupied); 
     13     output [7:0] space, 
     14     output [7:0] occupied); 
    1515 
    1616   localparam           NUM_FIFOS = (1<<DEPTH); 
     
    2424           .datain(datain),.write(write),.full(full), 
    2525           .dataout(dout[0]),.read(~empty_x[0] & ~full_x[1]),.empty(empty_x[0]), 
    26            .clear(clear),.space(space),.occupied() ); 
     26           .clear(clear),.space(space[4:0]),.occupied() ); 
    2727    
    2828   shortfifo #(.WIDTH(WIDTH)) 
     
    3030           .datain(dout[NUM_FIFOS-2]),.write(~empty_x[NUM_FIFOS-2] & ~full_x[NUM_FIFOS-1]),.full(full_x[NUM_FIFOS-1]), 
    3131           .dataout(dataout),.read(read),.empty(empty), 
    32            .clear(clear),.space(),.occupied(occupied) ); 
     32           .clear(clear),.space(),.occupied(occupied[4:0]) ); 
    3333 
    3434   genvar               i; 
     
    4444   endgenerate 
    4545 
     46   assign space[7:5] = 0; 
     47   assign occupied[7:5] = 0; 
     48    
    4649endmodule // medfifo 
  • usrp2/trunk/fpga/control_lib/simple_uart_rx.v

    r8726 r9092  
    6060      .datain(sr),.write(write),.full(full), 
    6161      .dataout(fifo_out),.read(fifo_read),.empty(fifo_empty), 
    62       .clear(0),.space(),.occupied(fifo_level[3:0]) ); 
    63    assign         fifo_level[7:4] = 0; 
     62      .clear(0),.space(),.occupied(fifo_level) ); 
    6463    
    6564endmodule // simple_uart_rx 
  • usrp2/trunk/fpga/control_lib/simple_uart_tx.v

    r8719 r9092  
    1616      .datain(fifo_in),.write(fifo_write),.full(fifo_full), 
    1717      .dataout(char_to_send),.read(read),.empty(empty), 
    18       .clear(0),.space(fifo_level[3:0]),.occupied() ); 
    19    assign         fifo_level[7:4] = 0; 
     18      .clear(0),.space(fifo_level),.occupied() ); 
    2019    
    2120   always @(posedge clk)