gwj / at91sam9263 · Commits

Commit fe8f096b16bf2328ec615d4314f06cd5545f32e5

Authored by ths
1 parent 8fac5803

Spelling fix, by Stuart Brady. 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3076 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 5 changed files with 25 additions and 25 deletions
audio/alsaaudio.c
  View file @fe8f096
... ... @@ -50,11 +50,11 @@ static struct {
50 50 unsigned int period_size_out;
51 51 unsigned int threshold;
52 52  
53   - int buffer_size_in_overriden;
54   - int period_size_in_overriden;
  53 + int buffer_size_in_overridden;
  54 + int period_size_in_overridden;
55 55  
56   - int buffer_size_out_overriden;
57   - int period_size_out_overriden;
  56 + int buffer_size_out_overridden;
  57 + int period_size_out_overridden;
58 58 int verbose;
59 59 } conf = {
60 60 #define DEFAULT_BUFFER_SIZE 1024
... ... @@ -75,10 +75,10 @@ static struct {
75 75 .period_size_in = DEFAULT_PERIOD_SIZE * 4,
76 76 .buffer_size_out = DEFAULT_BUFFER_SIZE,
77 77 .period_size_out = DEFAULT_PERIOD_SIZE,
78   - .buffer_size_in_overriden = 0,
79   - .buffer_size_out_overriden = 0,
80   - .period_size_in_overriden = 0,
81   - .period_size_out_overriden = 0,
  78 + .buffer_size_in_overridden = 0,
  79 + .buffer_size_out_overridden = 0,
  80 + .period_size_in_overridden = 0,
  81 + .period_size_out_overridden = 0,
82 82 #endif
83 83 .threshold = 0,
84 84 .verbose = 0
... ... @@ -414,8 +414,8 @@ static int alsa_open (int in, struct alsa_params_req *req,
414 414 }
415 415 else {
416 416 if (period_size < minval) {
417   - if ((in && conf.period_size_in_overriden)
418   - || (!in && conf.period_size_out_overriden)) {
  417 + if ((in && conf.period_size_in_overridden)
  418 + || (!in && conf.period_size_out_overridden)) {
419 419 dolog ("%s period size(%d) is less "
420 420 "than minmal period size(%ld)\n",
421 421 typ,
... ... @@ -450,8 +450,8 @@ static int alsa_open (int in, struct alsa_params_req *req,
450 450 }
451 451 else {
452 452 if (buffer_size < minval) {
453   - if ((in && conf.buffer_size_in_overriden)
454   - || (!in && conf.buffer_size_out_overriden)) {
  453 + if ((in && conf.buffer_size_in_overridden)
  454 + || (!in && conf.buffer_size_out_overridden)) {
455 455 dolog (
456 456 "%s buffer size(%d) is less "
457 457 "than minimal buffer size(%ld)\n",
... ... @@ -945,16 +945,16 @@ static struct audio_option alsa_options[] = {
945 945 {"DAC_SIZE_IN_USEC", AUD_OPT_BOOL, &conf.size_in_usec_out,
946 946 "DAC period/buffer size in microseconds (otherwise in frames)", NULL, 0},
947 947 {"DAC_PERIOD_SIZE", AUD_OPT_INT, &conf.period_size_out,
948   - "DAC period size", &conf.period_size_out_overriden, 0},
  948 + "DAC period size", &conf.period_size_out_overridden, 0},
949 949 {"DAC_BUFFER_SIZE", AUD_OPT_INT, &conf.buffer_size_out,
950   - "DAC buffer size", &conf.buffer_size_out_overriden, 0},
  950 + "DAC buffer size", &conf.buffer_size_out_overridden, 0},
951 951  
952 952 {"ADC_SIZE_IN_USEC", AUD_OPT_BOOL, &conf.size_in_usec_in,
953 953 "ADC period/buffer size in microseconds (otherwise in frames)", NULL, 0},
954 954 {"ADC_PERIOD_SIZE", AUD_OPT_INT, &conf.period_size_in,
955   - "ADC period size", &conf.period_size_in_overriden, 0},
  955 + "ADC period size", &conf.period_size_in_overridden, 0},
956 956 {"ADC_BUFFER_SIZE", AUD_OPT_INT, &conf.buffer_size_in,
957   - "ADC buffer size", &conf.buffer_size_in_overriden, 0},
  957 + "ADC buffer size", &conf.buffer_size_in_overridden, 0},
958 958  
959 959 {"THRESHOLD", AUD_OPT_INT, &conf.threshold,
960 960 "(undocumented)", NULL, 0},
... ...
audio/audio.c
  View file @fe8f096
... ... @@ -386,7 +386,7 @@ static void audio_print_options (const char *prefix,
386 386 const char *state = "default";
387 387 printf (" %s_%s: ", uprefix, opt->name);
388 388  
389   - if (opt->overridenp && *opt->overridenp) {
  389 + if (opt->overriddenp && *opt->overriddenp) {
390 390 state = "current";
391 391 }
392 392  
... ... @@ -516,10 +516,10 @@ static void audio_process_options (const char *prefix,
516 516 break;
517 517 }
518 518  
519   - if (!opt->overridenp) {
520   - opt->overridenp = &opt->overriden;
  519 + if (!opt->overriddenp) {
  520 + opt->overriddenp = &opt->overridden;
521 521 }
522   - *opt->overridenp = !def;
  522 + *opt->overriddenp = !def;
523 523 qemu_free (optname);
524 524 }
525 525 }
... ...
audio/audio_int.h
  View file @fe8f096
... ... @@ -44,8 +44,8 @@ struct audio_option {
44 44 audio_option_tag_e tag;
45 45 void *valp;
46 46 const char *descr;
47   - int *overridenp;
48   - int overriden;
  47 + int *overriddenp;
  48 + int overridden;
49 49 };
50 50  
51 51 struct audio_callback {
... ...
hw/pxa2xx.c
  View file @fe8f096
... ... @@ -2118,7 +2118,7 @@ struct pxa2xx_state_s *pxa270_init(unsigned int sdram_size,
2118 2118 s->i2s = pxa2xx_i2s_init(0x40400000, s->pic[PXA2XX_PIC_I2S], s->dma);
2119 2119  
2120 2120 /* GPIO1 resets the processor */
2121   - /* The handler can be overriden by board-specific code */
  2121 + /* The handler can be overridden by board-specific code */
2122 2122 pxa2xx_gpio_handler_set(s->gpio, 1, pxa2xx_reset, s);
2123 2123 return s;
2124 2124 }
... ... @@ -2227,7 +2227,7 @@ struct pxa2xx_state_s *pxa255_init(unsigned int sdram_size,
2227 2227 s->i2s = pxa2xx_i2s_init(0x40400000, s->pic[PXA2XX_PIC_I2S], s->dma);
2228 2228  
2229 2229 /* GPIO1 resets the processor */
2230   - /* The handler can be overriden by board-specific code */
  2230 + /* The handler can be overridden by board-specific code */
2231 2231 pxa2xx_gpio_handler_set(s->gpio, 1, pxa2xx_reset, s);
2232 2232 return s;
2233 2233 }
... ...
linux-user/syscall.c
  View file @fe8f096
... ... @@ -184,7 +184,7 @@ extern int getresgid(gid_t *, gid_t *, gid_t *);
184 184 extern int setgroups(int, gid_t *);
185 185  
186 186 /*
187   - * This list is the union of errno values overidden in asm-<arch>/errno.h
  187 + * This list is the union of errno values overridden in asm-<arch>/errno.h
188 188 * minus the errnos that are not actually generic to all archs.
189 189 */
190 190 static uint16_t host_to_target_errno_table[1200] = {
... ...