From: Luke Kenneth Casson Leighton Date: Mon, 25 Jun 2018 16:05:12 +0000 (+0100) Subject: whoops got comments wrong way round X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=18bab268a041dbb105401873c00d395c65b7fd0a;p=pinmux.git whoops got comments wrong way round --- diff --git a/src/bsv/pinmux_generator.py b/src/bsv/pinmux_generator.py index fcf47f0..400b08b 100644 --- a/src/bsv/pinmux_generator.py +++ b/src/bsv/pinmux_generator.py @@ -116,16 +116,12 @@ def write_pmp(pmp, p, ifaces, iocells): bsv_file.write(''' - interface PeripheralSide; - // declare the interface to the peripherals - // Each peripheral's function will be either an input, output - // or be bi-directional. an input field will be an output from the - // peripheral and an output field will be an input to the peripheral. - // Bi-directional functions also have an output-enable (which - // again comes *in* from the peripheral)''') - # ============================================================== + interface IOCellSide; + // declare the interface to the IO cells. + // Each IO cell will have 1 input field (output from pin mux) + // and an output and out-enable field (input to pinmux)''') - # == create method definitions for all peripheral interfaces ==# + # == create method definitions for all iocell interfaces ==# iocells.ifacefmt(bsv_file) # ===== finish interface definition and start module definition======= @@ -134,12 +130,16 @@ def write_pmp(pmp, p, ifaces, iocells): # ===== io cell definition ======= bsv_file.write(''' - interface IOCellSide; - // declare the interface to the IO cells. - // Each IO cell will have 1 input field (output from pin mux) - // and an output and out-enable field (input to pinmux)''') + interface PeripheralSide; + // declare the interface to the peripherals + // Each peripheral's function will be either an input, output + // or be bi-directional. an input field will be an output from the + // peripheral and an output field will be an input to the peripheral. + // Bi-directional functions also have an output-enable (which + // again comes *in* from the peripheral)''') + # ============================================================== - # == create method definitions for all iocell interfaces ==# + # == create method definitions for all peripheral interfaces ==# ifaces.ifacefmt(bsv_file) bsv_file.write("\n endinterface\n") diff --git a/src/test_bsv/pinmux.bsv b/src/test_bsv/pinmux.bsv index dcda6a6..04141cd 100644 --- a/src/test_bsv/pinmux.bsv +++ b/src/test_bsv/pinmux.bsv @@ -4,7 +4,7 @@ https://bitbucket.org/casl/pinmux. Authors: Neel Gala, Luke - Date of generation: Mon Jun 25 16:20:40 2018 + Date of generation: Mon Jun 25 17:04:53 2018 */ package pinmux; @@ -21,13 +21,10 @@ package pinmux; endinterface - interface PeripheralSide; - // declare the interface to the peripherals - // Each peripheral's function will be either an input, output - // or be bi-directional. an input field will be an output from the - // peripheral and an output field will be an input to the peripheral. - // Bi-directional functions also have an output-enable (which - // again comes *in* from the peripheral) + interface IOCellSide; + // declare the interface to the IO cells. + // Each IO cell will have 1 input field (output from pin mux) + // and an output and out-enable field (input to pinmux) // interface declaration between IO-0 and pinmux (*always_ready,always_enabled*) method Bit#(1) io0_cell_out; (*always_ready,always_enabled*) method Bit#(1) io0_cell_outen; @@ -46,10 +43,13 @@ package pinmux; endinterface - interface IOCellSide; - // declare the interface to the IO cells. - // Each IO cell will have 1 input field (output from pin mux) - // and an output and out-enable field (input to pinmux) + interface PeripheralSide; + // declare the interface to the peripherals + // Each peripheral's function will be either an input, output + // or be bi-directional. an input field will be an output from the + // peripheral and an output field will be an input to the peripheral. + // Bi-directional functions also have an output-enable (which + // again comes *in* from the peripheral) // interface declaration between UART-0 and pinmux (*always_ready,always_enabled*) method Action uart_tx (Bit#(1) in); (*always_ready,always_enabled*) method Bit#(1) uart_rx;