haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Rename hz to hertz to keep AIX happy

Browse source 
The issue was first noticed/addressed by Laurent Vivier in his QEMU on
AIX patches.

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5712 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
malc 2008-11-12 20:36:27 +00:00
parent 2946898b48
commit c310de8657
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
audio/audio.c
View file

@ -54,7 +54,7 @@ static struct {
struct fixed_settings fixed_out; struct fixed_settings fixed_out;
struct fixed_settings fixed_in; struct fixed_settings fixed_in;
union { union {
int hz; int hertz;
int64_t ticks; int64_t ticks;
} period; } period;
int plive; int plive;
@ -1520,7 +1520,7 @@ static struct audio_option audio_options[] = {
"Number of voices for ADC", NULL, 0}, "Number of voices for ADC", NULL, 0},
/* Misc */ /* Misc */
{"TIMER_PERIOD", AUD_OPT_INT, &conf.period.hz, {"TIMER_PERIOD", AUD_OPT_INT, &conf.period.hertz,
"Timer period in HZ (0 - use lowest possible)", NULL, 0}, "Timer period in HZ (0 - use lowest possible)", NULL, 0},
{"PLIVE", AUD_OPT_BOOL, &conf.plive, {"PLIVE", AUD_OPT_BOOL, &conf.plive,
@ -1781,16 +1781,16 @@ AudioState *AUD_init (void)
if (done) { if (done) {
VMChangeStateEntry *e; VMChangeStateEntry *e;
if (conf.period.hz <= 0) { if (conf.period.hertz <= 0) {
if (conf.period.hz < 0) { if (conf.period.hertz < 0) {
dolog ("warning: Timer period is negative - %d " dolog ("warning: Timer period is negative - %d "
"treating as zero\n", "treating as zero\n",
conf.period.hz); conf.period.hertz);
} }
conf.period.ticks = 1; conf.period.ticks = 1;
} }
else { else {
conf.period.ticks = ticks_per_sec / conf.period.hz; conf.period.ticks = ticks_per_sec / conf.period.hertz;
} }
e = qemu_add_vm_change_state_handler (audio_vm_change_state_handler, s); e = qemu_add_vm_change_state_handler (audio_vm_change_state_handler, s);