From 2695bb1d1811e398f6cc933ffac05f4333f9951a Mon Sep 17 00:00:00 2001 From: Zihao Yu Date: Mon, 6 Jul 2020 14:21:13 +0800 Subject: [PATCH] am: add dummy audio for platform without audio device --- am/arch/platform/navy.mk | 1 + am/arch/platform/sdi.mk | 1 + am/arch/riscv64-noop.mk | 1 + am/src/dummy/audio.c | 12 ++++++++++++ am/src/nemu/include/nemu.h | 10 +++++----- 5 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 am/src/dummy/audio.c diff --git a/am/arch/platform/navy.mk b/am/arch/platform/navy.mk index af0f8db2..79979a6e 100644 --- a/am/arch/platform/navy.mk +++ b/am/arch/platform/navy.mk @@ -2,6 +2,7 @@ AM_SRCS := navy/trm.c \ navy/ioe.c \ navy/dev/input.c \ navy/dev/timer.c \ + dummy/audio.c \ navy/dev/video.c NAVY_MAKEFILE = Makefile.navy diff --git a/am/arch/platform/sdi.mk b/am/arch/platform/sdi.mk index 1362ca8e..61426b1b 100644 --- a/am/arch/platform/sdi.mk +++ b/am/arch/platform/sdi.mk @@ -4,6 +4,7 @@ AM_SRCS += sdi/trm.c \ nemu/common/input.c \ nemu/common/timer.c \ nemu/common/video.c \ + dummy/audio.c \ dummy/cte.c \ dummy/vme.c \ dummy/mpe.c \ diff --git a/am/arch/riscv64-noop.mk b/am/arch/riscv64-noop.mk index 18f5e931..ae4aa6fd 100644 --- a/am/arch/riscv64-noop.mk +++ b/am/arch/riscv64-noop.mk @@ -13,6 +13,7 @@ AM_SRCS := noop/isa/riscv/trm.c \ noop/common/input.c \ noop/common/timer.c \ nemu/common/video.c \ + dummy/audio.c \ noop/isa/riscv/instr.c \ dummy/mpe.c \ nemu/isa/riscv/boot/start.S diff --git a/am/src/dummy/audio.c b/am/src/dummy/audio.c new file mode 100644 index 00000000..f0aa5ef0 --- /dev/null +++ b/am/src/dummy/audio.c @@ -0,0 +1,12 @@ +#include + +void __am_audio_init() { +} + +size_t __am_audio_write(uintptr_t reg, void *buf, size_t size) { + return 0; +} + +size_t __am_audio_read(uintptr_t reg, void *buf, size_t size) { + return 0; +} diff --git a/am/src/nemu/include/nemu.h b/am/src/nemu/include/nemu.h index 64cb4bba..26877b4a 100644 --- a/am/src/nemu/include/nemu.h +++ b/am/src/nemu/include/nemu.h @@ -20,11 +20,11 @@ # define AUDIO_COUNT_ADDR 0x214 # define AUDIO_SBUF_ADDR 0xa0800000 #elif defined(__ARCH_RISCV64_NOOP) || defined(__ARCH_RISCV32_NOOP) -# define KBD_ADDR 0x40900000 -# define RTC_ADDR 0x4800bff8 -# define SCREEN_ADDR 0x40800000 -# define SYNC_ADDR 0x40800004 -# define FB_ADDR 0x41000000 +//# define KBD_ADDR 0x40900000 +# define RTC_ADDR 0x3800bff8 +# define SCREEN_ADDR 0x40001000 +# define SYNC_ADDR 0x40001004 +# define FB_ADDR 0x50000000 #else # define SERIAL_PORT 0xa10003f8 # define KBD_ADDR 0xa1000060