mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
emulation: fix missing interrupts in peripherals
Now that we wire up the irq line, ensure the peripherals have actual interrupts. Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
parent
74abf35a08
commit
e0f4e0c47f
5 changed files with 98 additions and 42 deletions
0
emulation/peripherals/com_ec.cs
Normal file
0
emulation/peripherals/com_ec.cs
Normal file
|
|
@ -21,7 +21,7 @@ namespace Antmicro.Renode.Peripherals.Timers
|
||||||
[AllowedTranslations(AllowedTranslation.ByteToDoubleWord)]
|
[AllowedTranslations(AllowedTranslation.ByteToDoubleWord)]
|
||||||
public class TickTimer : BasicDoubleWordPeripheral, IKnownSize
|
public class TickTimer : BasicDoubleWordPeripheral, IKnownSize
|
||||||
{
|
{
|
||||||
public TickTimer(Machine machine, ulong periodInMs) : base(machine)
|
public TickTimer(Machine machine, ulong periodInMs = 1) : base(machine)
|
||||||
{
|
{
|
||||||
machine.ClockSource.AddClockEntry(new ClockEntry(periodInMs, ClockEntry.FrequencyToRatio(this, 1000), OnTick, this, "TickTimer"));
|
machine.ClockSource.AddClockEntry(new ClockEntry(periodInMs, ClockEntry.FrequencyToRatio(this, 1000), OnTick, this, "TickTimer"));
|
||||||
this.IRQ = new GPIO();
|
this.IRQ = new GPIO();
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,7 @@ namespace Antmicro.Renode.Peripherals.Miscellaneous
|
||||||
{
|
{
|
||||||
public BetrustedRNGKernel(Machine machine) : base(machine)
|
public BetrustedRNGKernel(Machine machine) : base(machine)
|
||||||
{
|
{
|
||||||
|
this.IRQ = new GPIO();
|
||||||
DefineRegisters();
|
DefineRegisters();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -35,6 +36,7 @@ namespace Antmicro.Renode.Peripherals.Miscellaneous
|
||||||
}
|
}
|
||||||
|
|
||||||
private readonly PseudorandomNumberGenerator rng = EmulationManager.Instance.CurrentEmulation.RandomGenerator;
|
private readonly PseudorandomNumberGenerator rng = EmulationManager.Instance.CurrentEmulation.RandomGenerator;
|
||||||
|
public GPIO IRQ { get; private set; }
|
||||||
|
|
||||||
private enum Registers
|
private enum Registers
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,7 @@ namespace Antmicro.Renode.Peripherals.Miscellaneous
|
||||||
{
|
{
|
||||||
public BetrustedRNGServer(Machine machine) : base(machine)
|
public BetrustedRNGServer(Machine machine) : base(machine)
|
||||||
{
|
{
|
||||||
|
this.IRQ = new GPIO();
|
||||||
DefineRegisters();
|
DefineRegisters();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -35,6 +36,7 @@ namespace Antmicro.Renode.Peripherals.Miscellaneous
|
||||||
}
|
}
|
||||||
|
|
||||||
private readonly PseudorandomNumberGenerator rng = EmulationManager.Instance.CurrentEmulation.RandomGenerator;
|
private readonly PseudorandomNumberGenerator rng = EmulationManager.Instance.CurrentEmulation.RandomGenerator;
|
||||||
|
public GPIO IRQ { get; private set; }
|
||||||
|
|
||||||
private enum Registers
|
private enum Registers
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -1,62 +1,114 @@
|
||||||
|
|
||||||
cpu: CPU.VexRiscv @ sysbus
|
cpu: CPU.VexRiscv @ sysbus
|
||||||
cpuType: "rv32imac"
|
cpuType: "rv32imac"
|
||||||
privilegeArchitecture: PrivilegeArchitecture.Priv1_10
|
privilegeArchitecture: PrivilegeArchitecture.Priv1_10
|
||||||
PerformanceInMips: 120
|
PerformanceInMips: 120
|
||||||
|
// Platform Peripherals
|
||||||
|
// Unrecognized peripheral: reboot
|
||||||
|
|
||||||
uart: UART.LiteX_UART @ {
|
// Unrecognized peripheral: crg
|
||||||
sysbus 0xF0004000 // shadow
|
|
||||||
}
|
|
||||||
-> cpu@1002
|
|
||||||
|
|
||||||
console: UART.LiteX_UART @ {
|
// Unrecognized peripheral: gpio
|
||||||
sysbus 0xF0006000
|
|
||||||
}
|
|
||||||
-> cpu@1003
|
|
||||||
|
|
||||||
app_uart: UART.LiteX_UART @ {
|
uart: UART.LiteX_UART @ sysbus 0xf0004000
|
||||||
sysbus 0xF0008000
|
-> cpu @ 1002
|
||||||
}
|
|
||||||
-> cpu@1004
|
|
||||||
|
|
||||||
timer0: Timers.LiteX_Timer_32 @ {
|
console: UART.LiteX_UART @ sysbus 0xf0006000
|
||||||
sysbus 0xF0022000
|
-> cpu @ 1003
|
||||||
}
|
|
||||||
frequency: 100000000
|
|
||||||
-> cpu@1001
|
|
||||||
|
|
||||||
rom: Memory.MappedMemory @ {
|
app_uart: UART.LiteX_UART @ sysbus 0xf0008000
|
||||||
sysbus 0x00000000;
|
-> cpu @ 1004
|
||||||
sysbus 0x80000000 // shadow
|
|
||||||
}
|
|
||||||
size: 0x00002000
|
|
||||||
|
|
||||||
sram: Memory.MappedMemory @ {
|
// Unrecognized peripheral: info
|
||||||
sysbus 0x40000000;
|
|
||||||
sysbus 0x90000000 // shadow
|
|
||||||
}
|
|
||||||
size: 16777216
|
|
||||||
|
|
||||||
fbmem: Memory.MappedMemory @ sysbus 0xB0000000
|
// Unrecognized peripheral: sram_ext
|
||||||
size: 0x6000
|
|
||||||
|
|
||||||
memlcd: Video.BetrustedLCD @ sysbus 0xF000B000
|
memlcd: Video.BetrustedLCD @ sysbus 0xf000b000
|
||||||
|
|
||||||
keyboard: Input.BetrustedKbd @ sysbus 0xF0015000
|
// Unrecognized peripheral: com
|
||||||
-> cpu @ 1011
|
|
||||||
|
|
||||||
trng_kernel: Miscellaneous.BetrustedRNGKernel @ sysbus 0xF001A000
|
// Unrecognized peripheral: i2c
|
||||||
|
|
||||||
trng_server: Miscellaneous.BetrustedRNGServer @ sysbus 0xF001B000
|
// Unrecognized peripheral: btevents
|
||||||
|
|
||||||
ticktimer: Timers.TickTimer @ sysbus 0xF0011000
|
// Unrecognized peripheral: messible
|
||||||
periodInMs: 1
|
|
||||||
|
// Unrecognized peripheral: messible2
|
||||||
|
|
||||||
|
ticktimer: Timers.TickTimer @ sysbus 0xf0011000
|
||||||
-> cpu @ 1008
|
-> cpu @ 1008
|
||||||
|
|
||||||
flash_mem: Memory.MappedMemory @ {
|
// Unrecognized peripheral: susres
|
||||||
sysbus 0x20000000;
|
|
||||||
sysbus 0xA0000000 // shadow
|
// Unrecognized peripheral: power
|
||||||
}
|
|
||||||
size: 0x8000000
|
// Unrecognized peripheral: spinor
|
||||||
|
|
||||||
|
keyboard: Input.BetrustedKbd @ sysbus 0xf0015000
|
||||||
|
-> cpu @ 1011
|
||||||
|
|
||||||
|
// Unrecognized peripheral: keyinject
|
||||||
|
|
||||||
|
// Unrecognized peripheral: seed
|
||||||
|
|
||||||
|
// Unrecognized peripheral: keyrom
|
||||||
|
|
||||||
|
// Unrecognized peripheral: audio
|
||||||
|
|
||||||
|
trng_kernel: Miscellaneous.BetrustedRNGKernel @ sysbus 0xf001a000
|
||||||
|
-> cpu @ 1013
|
||||||
|
|
||||||
|
trng_server: Miscellaneous.BetrustedRNGServer @ sysbus 0xf001b000
|
||||||
|
-> cpu @ 1014
|
||||||
|
|
||||||
|
// Unrecognized peripheral: trng
|
||||||
|
|
||||||
|
// Unrecognized peripheral: sha512
|
||||||
|
|
||||||
|
// Unrecognized peripheral: engine
|
||||||
|
|
||||||
|
// Unrecognized peripheral: jtag
|
||||||
|
|
||||||
|
// Unrecognized peripheral: wdt
|
||||||
|
|
||||||
|
// Unrecognized peripheral: d11ctime
|
||||||
|
|
||||||
|
// Unrecognized peripheral: identifier_mem
|
||||||
|
|
||||||
|
timer0: Timers.LiteX_Timer_32 @ sysbus 0xf0023000
|
||||||
|
frequency: 100000000
|
||||||
|
-> cpu @ 1000
|
||||||
|
|
||||||
|
|
||||||
|
// Physical base addresses of memory regions
|
||||||
|
rom: Memory.MappedMemory @ sysbus 0x00000000
|
||||||
|
size: 0x00008000
|
||||||
|
|
||||||
|
sram: Memory.MappedMemory @ sysbus 0x10000000
|
||||||
|
size: 0x00020000
|
||||||
|
|
||||||
|
vexriscv_debug: Memory.MappedMemory @ sysbus 0xefff0000
|
||||||
|
size: 0x00001000
|
||||||
|
|
||||||
|
sram_ext: Memory.MappedMemory @ sysbus 0x40000000
|
||||||
|
size: 0x01000000
|
||||||
|
|
||||||
|
fbmem: Memory.MappedMemory @ sysbus 0xb0000000
|
||||||
|
size: 0x00006000
|
||||||
|
|
||||||
|
spiflash: Memory.MappedMemory @ sysbus 0x20000000
|
||||||
|
size: 0x08000000
|
||||||
|
|
||||||
|
audio: Memory.MappedMemory @ sysbus 0xe0000000
|
||||||
|
size: 0x00001000
|
||||||
|
|
||||||
|
sha512: Memory.MappedMemory @ sysbus 0xe0002000
|
||||||
|
size: 0x00001000
|
||||||
|
|
||||||
|
engine: Memory.MappedMemory @ sysbus 0xe0020000
|
||||||
|
size: 0x00020000
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
sysbus:
|
sysbus:
|
||||||
init:
|
init:
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue