gwj / at91sam9263 · Commits

Commit c310de8657b12e805b2ac225e6932b8beed013cf

Authored by malc
1 parent 2946898b

Rename hz to hertz to keep AIX happy 

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
Inline Side-by-side
Showing 1 changed file with 6 additions and 6 deletions
audio/audio.c
  View file @c310de8
... ... @@ -54,7 +54,7 @@ static struct {
54 54 struct fixed_settings fixed_out;
55 55 struct fixed_settings fixed_in;
56 56 union {
57   - int hz;
  57 + int hertz;
58 58 int64_t ticks;
59 59 } period;
60 60 int plive;
... ... @@ -1520,7 +1520,7 @@ static struct audio_option audio_options[] = {
1520 1520 "Number of voices for ADC", NULL, 0},
1521 1521  
1522 1522 /* Misc */
1523   - {"TIMER_PERIOD", AUD_OPT_INT, &conf.period.hz,
  1523 + {"TIMER_PERIOD", AUD_OPT_INT, &conf.period.hertz,
1524 1524 "Timer period in HZ (0 - use lowest possible)", NULL, 0},
1525 1525  
1526 1526 {"PLIVE", AUD_OPT_BOOL, &conf.plive,
... ... @@ -1781,16 +1781,16 @@ AudioState *AUD_init (void)
1781 1781 if (done) {
1782 1782 VMChangeStateEntry *e;
1783 1783  
1784   - if (conf.period.hz <= 0) {
1785   - if (conf.period.hz < 0) {
  1784 + if (conf.period.hertz <= 0) {
  1785 + if (conf.period.hertz < 0) {
1786 1786 dolog ("warning: Timer period is negative - %d "
1787 1787 "treating as zero\n",
1788   - conf.period.hz);
  1788 + conf.period.hertz);
1789 1789 }
1790 1790 conf.period.ticks = 1;
1791 1791 }
1792 1792 else {
1793   - conf.period.ticks = ticks_per_sec / conf.period.hz;
  1793 + conf.period.ticks = ticks_per_sec / conf.period.hertz;
1794 1794 }
1795 1795  
1796 1796 e = qemu_add_vm_change_state_handler (audio_vm_change_state_handler, s);
... ...