zzy/NJU_PA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

> compile NEMU

Browse Source 
221220000 张三
Linux zzy 5.15.146.1-microsoft-standard-WSL2 #1 SMP Thu Jan 11 04:09:03 UTC 2024 x86_64 x86_64 x86_64 GNU/Linux
 14:31:34 up 4 days,  9:37,  1 user,  load average: 0.37, 0.48, 0.62
This commit is contained in:
tracer-ics2023
2024-09-21 14:31:34 +08:00
committed by zzy
parent 4de69c8157
commit 643c1ea222
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
nemu/src/device/audio.c
View File

@ -17,6 +17,8 @@
#include <device/map.h> #include <device/map.h>
#include <SDL2/SDL.h> #include <SDL2/SDL.h>
#include <stdatomic.h>
enum { enum {
reg_freq, reg_freq,
reg_channels, reg_channels,
@ -30,13 +32,12 @@ enum {
static uint8_t *sbuf = NULL; static uint8_t *sbuf = NULL;
static uint32_t *audio_base = NULL; static uint32_t *audio_base = NULL;
static uint32_t pos_read = 0; static uint32_t pos_read = 0;
static uint32_t audio_count = 0; static atomic_char32_t audio_count = 0;
#define MIN(a, b) ((a) < (b) ? (a) : (b)) #define MIN(a, b) ((a) < (b) ? (a) : (b))
static void audio_callback(void *userdata, uint8_t *stream, int len) { static void audio_callback(void *userdata, uint8_t *stream, int len) {
SDL_LockAudio(); uint32_t count = atomic_load(&audio_count);
uint32_t count = audio_count;
uint32_t read_cnt = MIN(count, len); uint32_t read_cnt = MIN(count, len);
uint32_t to_end_cnt = CONFIG_SB_SIZE - pos_read; uint32_t to_end_cnt = CONFIG_SB_SIZE - pos_read;
int32_t out_bound_cnt = read_cnt - to_end_cnt; int32_t out_bound_cnt = read_cnt - to_end_cnt;
@ -50,8 +51,8 @@ static void audio_callback(void *userdata, uint8_t *stream, int len) {
pos_read += read_cnt; pos_read += read_cnt;
pos_read %= CONFIG_SB_SIZE; pos_read %= CONFIG_SB_SIZE;
// if (len > read_cnt) memset(stream + read_cnt, 0, len - read_cnt); // if (len > read_cnt) memset(stream + read_cnt, 0, len - read_cnt);
audio_count -= read_cnt; count -= read_cnt;
SDL_UnlockAudio(); atomic_store(&audio_count, count);
} }
static inline void init_audio_dev() { static inline void init_audio_dev() {
@ -85,11 +86,9 @@ static void audio_io_handler(uint32_t offset, int len, bool is_write) {
} }
break; break;
case reg_count: case reg_count:
SDL_LockAudio();
// TODO: must be add a lock here // TODO: must be add a lock here
if (is_write) audio_count = audio_base[reg_count]; if (is_write) atomic_store(&audio_count, audio_base[reg_count]);
else audio_base[reg_count] = audio_count; else audio_base[reg_count] = atomic_load(&audio_count);
SDL_UnlockAudio();
break; break;
default: default:
assert(0); assert(0);