github.com/rdolbeau.SBusFPGA
1
0
Fork 0
mirror of synced 2026-04-25 20:11:24 +00:00
Code Issues Projects Releases Wiki Activity

cleanups

Browse Source
This commit is contained in:
Romain Dolbeau
2021-06-23 07:56:39 -04:00
parent 4ad0a648e3
commit d3aa008b8b
2 changed files with 82 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

166
sbus-to-ztex-gateware-migen/sbus_to_fpga_fsm.py
View File

@@ -280,8 +280,14 @@ class SBusFPGABus(Module):
#led4 = platform.request("user_led", 4) #led4 = platform.request("user_led", 4)
self.sync += platform.request("user_led", 0).eq(self.wishbone_master.cyc) self.sync += platform.request("user_led", 0).eq(self.wishbone_master.cyc)
self.sync += platform.request("user_led", 1).eq(~SBUS_3V3_SELs_i) self.sync += platform.request("user_led", 1).eq(self.wishbone_master.stb)
self.sync += platform.request("user_led", 2).eq(self.wishbone_master.we)
self.sync += platform.request("user_led", 3).eq(self.wishbone_master.ack)
self.sync += platform.request("user_led", 4).eq(~SBUS_3V3_SELs_i)
self.sync += platform.request("user_led", 5).eq(~SBUS_3V3_ASs_i)
self.sync += platform.request("user_led", 6).eq(wishbone_master_timeout == 0)
led7 = platform.request("user_led", 7)
#self.sync += platform.request("user_led", 5).eq(self.wishbone_slave.cyc) #self.sync += platform.request("user_led", 5).eq(self.wishbone_slave.cyc)
#self.sync += platform.request("user_led", 6).eq(~SBUS_3V3_BRs_o) #self.sync += platform.request("user_led", 6).eq(~SBUS_3V3_BRs_o)
#self.sync += platform.request("user_led", 7).eq(~SBUS_3V3_BGs_i) #self.sync += platform.request("user_led", 7).eq(~SBUS_3V3_BGs_i)
@@ -331,21 +337,10 @@ class SBusFPGABus(Module):
If((self.hold_reset == 0), NextState("Idle")) If((self.hold_reset == 0), NextState("Idle"))
) )
slave_fsm.act("Idle", slave_fsm.act("Idle",
#NextValue(self.led_display.value, 0x0000000010 | self.led_display.value),
# If(((SBUS_3V3_SELs_i == 0) &
# (SBUS_3V3_ASs_i == 0) &
# self.wishbone_master.cyc), ## refuse access until we've cleaned up the mess
# NextValue(self.led_display.value, 0x00000010 | 0x00000001),
# NextValue(sbus_oe_master_in, 1),
# NextValue(SBUS_3V3_ACKs_o, ACK_RERUN),
# NextValue(SBUS_3V3_ERRs_o, 1),
# NextState("Slave_Error")
# ).Eli
If(((SBUS_3V3_SELs_i == 0) & If(((SBUS_3V3_SELs_i == 0) &
(SBUS_3V3_ASs_i == 0) & (SBUS_3V3_ASs_i == 0) &
(siz_is_word(SBUS_3V3_SIZ_i)) & (siz_is_word(SBUS_3V3_SIZ_i)) &
(SBUS_3V3_PPRD_i == 1) & (SBUS_3V3_PPRD_i == 1)),
(SBUS_3V3_PA_i[0:2] == 0)),
NextValue(sbus_oe_master_in, 1), NextValue(sbus_oe_master_in, 1),
NextValue(sbus_last_pa, SBUS_3V3_PA_i), NextValue(sbus_last_pa, SBUS_3V3_PA_i),
NextValue(burst_counter, 0), NextValue(burst_counter, 0),
@@ -355,7 +350,11 @@ class SBusFPGABus(Module):
SIZ_BURST4: NextValue(burst_limit_m1, 3), SIZ_BURST4: NextValue(burst_limit_m1, 3),
SIZ_BURST8: NextValue(burst_limit_m1, 7), SIZ_BURST8: NextValue(burst_limit_m1, 7),
SIZ_BURST16: NextValue(burst_limit_m1, 15)}), SIZ_BURST16: NextValue(burst_limit_m1, 15)}),
If((SBUS_3V3_PA_i[ADDR_PFX_LOW:ADDR_PFX_LOW+ADDR_PFX_LENGTH] == ROM_ADDR_PFX), If(SBUS_3V3_PA_i[0:2] != 0,
NextValue(SBUS_3V3_ACKs_o, ACK_ERR),
NextValue(SBUS_3V3_ERRs_o, 1),
NextState("Slave_Error")
).Elif((SBUS_3V3_PA_i[ADDR_PFX_LOW:ADDR_PFX_LOW+ADDR_PFX_LENGTH] == ROM_ADDR_PFX),
NextValue(SBUS_3V3_ACKs_o, ACK_WORD), NextValue(SBUS_3V3_ACKs_o, ACK_WORD),
NextValue(SBUS_3V3_ERRs_o, 1), NextValue(SBUS_3V3_ERRs_o, 1),
NextValue(p_data, prom[SBUS_3V3_PA_i[ADDR_PHYS_LOW+2:ADDR_PFX_LOW]]), NextValue(p_data, prom[SBUS_3V3_PA_i[ADDR_PHYS_LOW+2:ADDR_PFX_LOW]]),
@@ -431,7 +430,11 @@ class SBusFPGABus(Module):
(SBUS_3V3_PPRD_i == 1)), (SBUS_3V3_PPRD_i == 1)),
NextValue(sbus_oe_master_in, 1), NextValue(sbus_oe_master_in, 1),
NextValue(sbus_last_pa, SBUS_3V3_PA_i), NextValue(sbus_last_pa, SBUS_3V3_PA_i),
If((SBUS_3V3_PA_i[ADDR_PFX_LOW:ADDR_PFX_LOW+ADDR_PFX_LENGTH] == SRAM_ADDR_PFX), If(SBUS_3V3_PA_i[0:1] != 0,
NextValue(SBUS_3V3_ACKs_o, ACK_ERR),
NextValue(SBUS_3V3_ERRs_o, 1),
NextState("Slave_Error")
).Elif((SBUS_3V3_PA_i[ADDR_PFX_LOW:ADDR_PFX_LOW+ADDR_PFX_LENGTH] == SRAM_ADDR_PFX),
NextValue(SBUS_3V3_ACKs_o, ACK_IDLE), # need to wait for data, don't ACK yet NextValue(SBUS_3V3_ACKs_o, ACK_IDLE), # need to wait for data, don't ACK yet
NextValue(SBUS_3V3_ERRs_o, 1), NextValue(SBUS_3V3_ERRs_o, 1),
NextValue(sbus_wishbone_le, (SBUS_3V3_PA_i[ADDR_PFX_LOW:ADDR_PFX_LOW+ADDR_PFX_LENGTH] == SRAM_ADDR_PFX)), NextValue(sbus_wishbone_le, (SBUS_3V3_PA_i[ADDR_PFX_LOW:ADDR_PFX_LOW+ADDR_PFX_LENGTH] == SRAM_ADDR_PFX)),
@@ -458,38 +461,42 @@ class SBusFPGABus(Module):
).Elif(((SBUS_3V3_SELs_i == 0) & ).Elif(((SBUS_3V3_SELs_i == 0) &
(SBUS_3V3_ASs_i == 0) & (SBUS_3V3_ASs_i == 0) &
(siz_is_word(SBUS_3V3_SIZ_i)) & (siz_is_word(SBUS_3V3_SIZ_i)) &
(SBUS_3V3_PPRD_i == 0) & (SBUS_3V3_PPRD_i == 0)),
(SBUS_3V3_PA_i[0:2] == 0)), NextValue(sbus_oe_master_in, 1),
NextValue(sbus_oe_master_in, 1), NextValue(sbus_last_pa, SBUS_3V3_PA_i),
NextValue(sbus_last_pa, SBUS_3V3_PA_i), NextValue(burst_counter, 0),
NextValue(burst_counter, 0), Case(SBUS_3V3_SIZ_i, {
Case(SBUS_3V3_SIZ_i, { SIZ_WORD: NextValue(burst_limit_m1, 0),
SIZ_WORD: NextValue(burst_limit_m1, 0), SIZ_BURST2: NextValue(burst_limit_m1, 1),
SIZ_BURST2: NextValue(burst_limit_m1, 1), SIZ_BURST4: NextValue(burst_limit_m1, 3),
SIZ_BURST4: NextValue(burst_limit_m1, 3), SIZ_BURST8: NextValue(burst_limit_m1, 7),
SIZ_BURST8: NextValue(burst_limit_m1, 7), SIZ_BURST16: NextValue(burst_limit_m1, 15)
SIZ_BURST16: NextValue(burst_limit_m1, 15)}), }),
If(((SBUS_3V3_PA_i[ADDR_PFX_LOW:ADDR_PFX_LOW+ADDR_PFX_LENGTH] == WISHBONE_CSR_ADDR_PFX) | If(SBUS_3V3_PA_i[0:2] != 0,
(SBUS_3V3_PA_i[ADDR_PFX_LOW:ADDR_PFX_LOW+ADDR_PFX_LENGTH] == USBOHCI_ADDR_PFX) | NextValue(SBUS_3V3_ACKs_o, ACK_ERR),
(SBUS_3V3_PA_i[ADDR_PFX_LOW:ADDR_PFX_LOW+ADDR_PFX_LENGTH] == SRAM_ADDR_PFX)),
NextValue(sbus_wishbone_le, (SBUS_3V3_PA_i[ADDR_PFX_LOW:ADDR_PFX_LOW+ADDR_PFX_LENGTH] == SRAM_ADDR_PFX)),
If(~self.wishbone_master.cyc,
NextValue(SBUS_3V3_ACKs_o, ACK_WORD),
NextValue(SBUS_3V3_ERRs_o, 1), NextValue(SBUS_3V3_ERRs_o, 1),
#NextValue(self.led_display.value, 0x0000000010 | Cat(Signal(8, reset = 0), SBUS_3V3_PA_i, Signal(4, reset = 0))), NextState("Slave_Error")
NextState("Slave_Ack_Reg_Write_Burst") ).Elif(((SBUS_3V3_PA_i[ADDR_PFX_LOW:ADDR_PFX_LOW+ADDR_PFX_LENGTH] == WISHBONE_CSR_ADDR_PFX) |
).Else( (SBUS_3V3_PA_i[ADDR_PFX_LOW:ADDR_PFX_LOW+ADDR_PFX_LENGTH] == USBOHCI_ADDR_PFX) |
NextValue(SBUS_3V3_ACKs_o, ACK_IDLE), (SBUS_3V3_PA_i[ADDR_PFX_LOW:ADDR_PFX_LOW+ADDR_PFX_LENGTH] == SRAM_ADDR_PFX)),
NextValue(SBUS_3V3_ERRs_o, 1), NextValue(sbus_wishbone_le, (SBUS_3V3_PA_i[ADDR_PFX_LOW:ADDR_PFX_LOW+ADDR_PFX_LENGTH] == SRAM_ADDR_PFX)),
NextValue(sbus_slave_timeout, sbus_default_timeout), If(~self.wishbone_master.cyc,
NextState("Slave_Ack_Reg_Write_Burst_Wait_For_Wishbone") NextValue(SBUS_3V3_ACKs_o, ACK_WORD),
) NextValue(SBUS_3V3_ERRs_o, 1),
).Else( #NextValue(self.led_display.value, 0x0000000010 | Cat(Signal(8, reset = 0), SBUS_3V3_PA_i, Signal(4, reset = 0))),
#NextValue(self.led_display.value, 0x0000000060 | 0x0000000001), NextState("Slave_Ack_Reg_Write_Burst")
NextValue(SBUS_3V3_ACKs_o, ACK_ERR), ).Else(
NextValue(SBUS_3V3_ERRs_o, 1), NextValue(SBUS_3V3_ACKs_o, ACK_IDLE),
NextState("Slave_Error") NextValue(SBUS_3V3_ERRs_o, 1),
) NextValue(sbus_slave_timeout, sbus_default_timeout),
NextState("Slave_Ack_Reg_Write_Burst_Wait_For_Wishbone")
)
).Else(
#NextValue(self.led_display.value, 0x0000000060 | 0x0000000001),
NextValue(SBUS_3V3_ACKs_o, ACK_ERR),
NextValue(SBUS_3V3_ERRs_o, 1),
NextState("Slave_Error")
)
).Elif(((SBUS_3V3_SELs_i == 0) & ).Elif(((SBUS_3V3_SELs_i == 0) &
(SBUS_3V3_ASs_i == 0) & (SBUS_3V3_ASs_i == 0) &
(SIZ_BYTE == SBUS_3V3_SIZ_i) & (SIZ_BYTE == SBUS_3V3_SIZ_i) &
@@ -519,27 +526,31 @@ class SBusFPGABus(Module):
(SBUS_3V3_ASs_i == 0) & (SBUS_3V3_ASs_i == 0) &
(SIZ_HWORD == SBUS_3V3_SIZ_i) & (SIZ_HWORD == SBUS_3V3_SIZ_i) &
(SBUS_3V3_PPRD_i == 0)), (SBUS_3V3_PPRD_i == 0)),
NextValue(sbus_oe_master_in, 1), NextValue(sbus_oe_master_in, 1),
NextValue(sbus_last_pa, SBUS_3V3_PA_i), NextValue(sbus_last_pa, SBUS_3V3_PA_i),
If((SBUS_3V3_PA_i[ADDR_PFX_LOW:ADDR_PFX_LOW+ADDR_PFX_LENGTH] == SRAM_ADDR_PFX), If(SBUS_3V3_PA_i[0:1] != 0,
NextValue(sbus_wishbone_le, (SBUS_3V3_PA_i[ADDR_PFX_LOW:ADDR_PFX_LOW+ADDR_PFX_LENGTH] == SRAM_ADDR_PFX)), NextValue(SBUS_3V3_ACKs_o, ACK_ERR),
If(~self.wishbone_master.cyc,
NextValue(SBUS_3V3_ACKs_o, ACK_HWORD),
NextValue(SBUS_3V3_ERRs_o, 1), NextValue(SBUS_3V3_ERRs_o, 1),
#NextValue(self.led_display.value, 0x0000000010 | Cat(Signal(8, reset = 0), SBUS_3V3_PA_i, Signal(4, reset = 0))), NextState("Slave_Error")
NextState("Slave_Ack_Reg_Write_HWord") ).Elif((SBUS_3V3_PA_i[ADDR_PFX_LOW:ADDR_PFX_LOW+ADDR_PFX_LENGTH] == SRAM_ADDR_PFX),
).Else( NextValue(sbus_wishbone_le, (SBUS_3V3_PA_i[ADDR_PFX_LOW:ADDR_PFX_LOW+ADDR_PFX_LENGTH] == SRAM_ADDR_PFX)),
NextValue(SBUS_3V3_ACKs_o, ACK_IDLE), If(~self.wishbone_master.cyc,
NextValue(SBUS_3V3_ERRs_o, 1), NextValue(SBUS_3V3_ACKs_o, ACK_HWORD),
NextValue(sbus_slave_timeout, sbus_default_timeout), NextValue(SBUS_3V3_ERRs_o, 1),
NextState("Slave_Ack_Reg_Write_HWord_Wait_For_Wishbone") #NextValue(self.led_display.value, 0x0000000010 | Cat(Signal(8, reset = 0), SBUS_3V3_PA_i, Signal(4, reset = 0))),
) NextState("Slave_Ack_Reg_Write_HWord")
).Else( ).Else(
#NextValue(self.led_display.value, 0x0000000060 | 0x0000000001), NextValue(SBUS_3V3_ACKs_o, ACK_IDLE),
NextValue(SBUS_3V3_ACKs_o, ACK_ERR), NextValue(SBUS_3V3_ERRs_o, 1),
NextValue(SBUS_3V3_ERRs_o, 1), NextValue(sbus_slave_timeout, sbus_default_timeout),
NextState("Slave_Error") NextState("Slave_Ack_Reg_Write_HWord_Wait_For_Wishbone")
) )
).Else(
#NextValue(self.led_display.value, 0x0000000060 | 0x0000000001),
NextValue(SBUS_3V3_ACKs_o, ACK_ERR),
NextValue(SBUS_3V3_ERRs_o, 1),
NextState("Slave_Error")
)
).Elif(SBUS_3V3_BGs_i & ).Elif(SBUS_3V3_BGs_i &
self.wishbone_slave.cyc & self.wishbone_slave.cyc &
self.wishbone_slave.stb & self.wishbone_slave.stb &
@@ -596,33 +607,18 @@ class SBusFPGABus(Module):
#NextValue(self.led_display.value, 0x0000000000 | Cat(Signal(8, reset = 0x00), self.wishbone_slave.adr)), #NextValue(self.led_display.value, 0x0000000000 | Cat(Signal(8, reset = 0x00), self.wishbone_slave.adr)),
NextState("Master_Translation") NextState("Master_Translation")
).Elif(((SBUS_3V3_SELs_i == 0) & ).Elif(((SBUS_3V3_SELs_i == 0) &
(SBUS_3V3_ASs_i == 0) & (SBUS_3V3_ASs_i == 0)),
((SIZ_HWORD == SBUS_3V3_SIZ_i) | (SIZ_BYTE == SBUS_3V3_SIZ_i))),
NextValue(sbus_oe_master_in, 1),
NextValue(sbus_last_pa, SBUS_3V3_PA_i),
#NextValue(self.led_display.value, 0x00000000a0 | SBUS_3V3_PPRD_i | Cat(Signal(8, reset = 0), SBUS_3V3_PA_i, Signal(4, reset = 0))),
NextValue(SBUS_3V3_ACKs_o, ACK_ERR),
NextValue(SBUS_3V3_ERRs_o, 1),
NextState("Slave_Error")
).Elif(((SBUS_3V3_SELs_i == 0) &
(SBUS_3V3_ASs_i == 0) &
(~self.wishbone_master.cyc)),
NextValue(sbus_oe_master_in, 1), NextValue(sbus_oe_master_in, 1),
NextValue(SBUS_3V3_ACKs_o, ACK_ERR), NextValue(SBUS_3V3_ACKs_o, ACK_ERR),
NextValue(SBUS_3V3_ERRs_o, 1), NextValue(SBUS_3V3_ERRs_o, 1),
#NextValue(self.led_display.value, 0x000000000F | Cat(Signal(8, reset = 0x00), SBUS_3V3_PA_i, SBUS_3V3_SIZ_i, SBUS_3V3_PPRD_i)), #NextValue(self.led_display.value, 0x000000000F | Cat(Signal(8, reset = 0x00), SBUS_3V3_PA_i, SBUS_3V3_SIZ_i, SBUS_3V3_PPRD_i)),
NextState("Slave_Error") NextState("Slave_Error")
).Elif(((SBUS_3V3_SELs_i == 0) & ).Elif(((SBUS_3V3_SELs_i == 0) &
(SBUS_3V3_ASs_i == 0) & (SBUS_3V3_ASs_i == 0)), ## we need to answer, set ACK_ERR
(self.wishbone_master.cyc)), ## we need to answer, set ACK_RERUN
NextValue(sbus_oe_master_in, 1), NextValue(sbus_oe_master_in, 1),
NextValue(SBUS_3V3_ACKs_o, ACK_RERUN), NextValue(SBUS_3V3_ACKs_o, ACK_ERR),
#NextValue(self.led_display.value, 0x00000000C0 | Cat(self.wishbone_master.cyc, self.wishbone_master.stb, self.wishbone_master.we, self.wishbone_master.ack, Signal(4, reset = 0x00), SBUS_3V3_PA_i, SBUS_3V3_SIZ_i, SBUS_3V3_PPRD_i)), #NextValue(self.led_display.value, 0x00000000C0 | Cat(self.wishbone_master.cyc, self.wishbone_master.stb, self.wishbone_master.we, self.wishbone_master.ack, Signal(4, reset = 0x00), SBUS_3V3_PA_i, SBUS_3V3_SIZ_i, SBUS_3V3_PPRD_i)),
NextState("Slave_Error") NextState("Slave_Error")
).Elif(((SBUS_3V3_SELs_i != 0) &
(SBUS_3V3_ASs_i != 0) &
(self.wishbone_master.cyc)),
NextValue(sbus_oe_master_in, 0),
).Elif(~SBUS_3V3_BGs_i, ).Elif(~SBUS_3V3_BGs_i,
### ouch we got the bus but nothing more to do ?!? ### ouch we got the bus but nothing more to do ?!?
NextValue(SBUS_3V3_BRs_o, 1), NextValue(SBUS_3V3_BRs_o, 1),

2
sbus-to-ztex-gateware-migen/sbus_to_fpga_soc.py
View File

@@ -224,7 +224,7 @@ class SBusFPGA(SoCCore):
##self.bus.add_master(name="SBusBridgeToWishbone", master=self.sbus_to_wishbone.wishbone) ##self.bus.add_master(name="SBusBridgeToWishbone", master=self.sbus_to_wishbone.wishbone)
##self.bus.add_slave(name="usb_fake_dma", slave=self.wishbone_to_sbus.wishbone, region=SoCRegion(origin=self.mem_map.get("usb_fake_dma", None), size=0x03ffffff, cached=False)) ##self.bus.add_slave(name="usb_fake_dma", slave=self.wishbone_to_sbus.wishbone, region=SoCRegion(origin=self.mem_map.get("usb_fake_dma", None), size=0x03ffffff, cached=False))
self.bus.add_master(name="SBusBridgeToWishbone", master=self.sbus_bus.wishbone_master) self.bus.add_master(name="SBusBridgeToWishbone", master=self.sbus_bus.wishbone_master)
self.bus.add_slave(name="usb_fake_dma", slave=self.sbus_bus.wishbone_slave, region=SoCRegion(origin=self.mem_map.get("usb_fake_dma", None), size=0x03ffffff, cached=False)) #self.bus.add_slave(name="usb_fake_dma", slave=self.sbus_bus.wishbone_slave, region=SoCRegion(origin=self.mem_map.get("usb_fake_dma", None), size=0x03ffffff, cached=False))
# self.soc = Module() # self.soc = Module()
# self.soc.mem_regions = self.mem_regions = {} # self.soc.mem_regions = self.mem_regions = {}