Commit fe8f096b authored by ths's avatar ths

Spelling fix, by Stuart Brady.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3076 c046a42c-6fe2-441c-8c8c-71466251a162
parent 8fac5803
......@@ -50,11 +50,11 @@ static struct {
unsigned int period_size_out;
unsigned int threshold;
int buffer_size_in_overriden;
int period_size_in_overriden;
int buffer_size_in_overridden;
int period_size_in_overridden;
int buffer_size_out_overriden;
int period_size_out_overriden;
int buffer_size_out_overridden;
int period_size_out_overridden;
int verbose;
} conf = {
#define DEFAULT_BUFFER_SIZE 1024
......@@ -75,10 +75,10 @@ static struct {
.period_size_in = DEFAULT_PERIOD_SIZE * 4,
.buffer_size_out = DEFAULT_BUFFER_SIZE,
.period_size_out = DEFAULT_PERIOD_SIZE,
.buffer_size_in_overriden = 0,
.buffer_size_out_overriden = 0,
.period_size_in_overriden = 0,
.period_size_out_overriden = 0,
.buffer_size_in_overridden = 0,
.buffer_size_out_overridden = 0,
.period_size_in_overridden = 0,
.period_size_out_overridden = 0,
#endif
.threshold = 0,
.verbose = 0
......@@ -414,8 +414,8 @@ static int alsa_open (int in, struct alsa_params_req *req,
}
else {
if (period_size < minval) {
if ((in && conf.period_size_in_overriden)
|| (!in && conf.period_size_out_overriden)) {
if ((in && conf.period_size_in_overridden)
|| (!in && conf.period_size_out_overridden)) {
dolog ("%s period size(%d) is less "
"than minmal period size(%ld)\n",
typ,
......@@ -450,8 +450,8 @@ static int alsa_open (int in, struct alsa_params_req *req,
}
else {
if (buffer_size < minval) {
if ((in && conf.buffer_size_in_overriden)
|| (!in && conf.buffer_size_out_overriden)) {
if ((in && conf.buffer_size_in_overridden)
|| (!in && conf.buffer_size_out_overridden)) {
dolog (
"%s buffer size(%d) is less "
"than minimal buffer size(%ld)\n",
......@@ -945,16 +945,16 @@ static struct audio_option alsa_options[] = {
{"DAC_SIZE_IN_USEC", AUD_OPT_BOOL, &conf.size_in_usec_out,
"DAC period/buffer size in microseconds (otherwise in frames)", NULL, 0},
{"DAC_PERIOD_SIZE", AUD_OPT_INT, &conf.period_size_out,
"DAC period size", &conf.period_size_out_overriden, 0},
"DAC period size", &conf.period_size_out_overridden, 0},
{"DAC_BUFFER_SIZE", AUD_OPT_INT, &conf.buffer_size_out,
"DAC buffer size", &conf.buffer_size_out_overriden, 0},
"DAC buffer size", &conf.buffer_size_out_overridden, 0},
{"ADC_SIZE_IN_USEC", AUD_OPT_BOOL, &conf.size_in_usec_in,
"ADC period/buffer size in microseconds (otherwise in frames)", NULL, 0},
{"ADC_PERIOD_SIZE", AUD_OPT_INT, &conf.period_size_in,
"ADC period size", &conf.period_size_in_overriden, 0},
"ADC period size", &conf.period_size_in_overridden, 0},
{"ADC_BUFFER_SIZE", AUD_OPT_INT, &conf.buffer_size_in,
"ADC buffer size", &conf.buffer_size_in_overriden, 0},
"ADC buffer size", &conf.buffer_size_in_overridden, 0},
{"THRESHOLD", AUD_OPT_INT, &conf.threshold,
"(undocumented)", NULL, 0},
......
......@@ -386,7 +386,7 @@ static void audio_print_options (const char *prefix,
const char *state = "default";
printf (" %s_%s: ", uprefix, opt->name);
if (opt->overridenp && *opt->overridenp) {
if (opt->overriddenp && *opt->overriddenp) {
state = "current";
}
......@@ -516,10 +516,10 @@ static void audio_process_options (const char *prefix,
break;
}
if (!opt->overridenp) {
opt->overridenp = &opt->overriden;
if (!opt->overriddenp) {
opt->overriddenp = &opt->overridden;
}
*opt->overridenp = !def;
*opt->overriddenp = !def;
qemu_free (optname);
}
}
......
......@@ -44,8 +44,8 @@ struct audio_option {
audio_option_tag_e tag;
void *valp;
const char *descr;
int *overridenp;
int overriden;
int *overriddenp;
int overridden;
};
struct audio_callback {
......
......@@ -2118,7 +2118,7 @@ struct pxa2xx_state_s *pxa270_init(unsigned int sdram_size,
s->i2s = pxa2xx_i2s_init(0x40400000, s->pic[PXA2XX_PIC_I2S], s->dma);
/* GPIO1 resets the processor */
/* The handler can be overriden by board-specific code */
/* The handler can be overridden by board-specific code */
pxa2xx_gpio_handler_set(s->gpio, 1, pxa2xx_reset, s);
return s;
}
......@@ -2227,7 +2227,7 @@ struct pxa2xx_state_s *pxa255_init(unsigned int sdram_size,
s->i2s = pxa2xx_i2s_init(0x40400000, s->pic[PXA2XX_PIC_I2S], s->dma);
/* GPIO1 resets the processor */
/* The handler can be overriden by board-specific code */
/* The handler can be overridden by board-specific code */
pxa2xx_gpio_handler_set(s->gpio, 1, pxa2xx_reset, s);
return s;
}
......@@ -184,7 +184,7 @@ extern int getresgid(gid_t *, gid_t *, gid_t *);
extern int setgroups(int, gid_t *);
/*
* This list is the union of errno values overidden in asm-<arch>/errno.h
* This list is the union of errno values overridden in asm-<arch>/errno.h
* minus the errnos that are not actually generic to all archs.
*/
static uint16_t host_to_target_errno_table[1200] = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment