* [Qemu-devel] [PATCH 1/6] Add spelling exceptions for codespell
2011-12-09 23:19 [Qemu-devel] [PATCH 0/6] New fixes for some misspellings Stefan Weil
@ 2011-12-09 23:19 ` Stefan Weil
2011-12-10 0:49 ` Andreas Färber
2011-12-09 23:19 ` [Qemu-devel] [PATCH 2/6] fmopl: Fix spelling in code and comments Stefan Weil
` (5 subsequent siblings)
6 siblings, 1 reply; 10+ messages in thread
From: Stefan Weil @ 2011-12-09 23:19 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Stefan Weil
This file can be used with codespell to suppress wrong
misspelling reports.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
scripts/codespell.exclude | 215 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 215 insertions(+), 0 deletions(-)
create mode 100644 scripts/codespell.exclude
diff --git a/scripts/codespell.exclude b/scripts/codespell.exclude
new file mode 100644
index 0000000..d69c946
--- /dev/null
+++ b/scripts/codespell.exclude
@@ -0,0 +1,215 @@
+ .rela.bss : { *(.rela.bss) }
+ .rela.bss : { *(.rela.bss) }
+ .rela.bss : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) }
+ *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*)
+ *(.rela.ctors)
+ .rela.ctors : { *(.rela.ctors) }
+ .rela.ctors : { *(.rela.ctors) }
+ .rela.ctors : { *(.rela.ctors) }
+ .rela.data :
+ .rela.data : { *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*) }
+ *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*)
+ { *(.rela.data) *(.rela.gnu.linkonce.d*) }
+ .rela.data.rel.ro : { *(.rela.data.rel.ro* .rela.gnu.linkonce.d.rel.ro.*) }
+ *(.rela.dtors)
+ .rela.dtors : { *(.rela.dtors) }
+ .rela.dtors : { *(.rela.dtors) }
+ .rela.dtors : { *(.rela.dtors) }
+ .rela.dyn :
+ *(.rela.fini)
+ .rela.fini : { *(.rela.fini) }
+ .rela.fini : { *(.rela.fini) }
+ .rela.fini : { *(.rela.fini) }
+ *(.rela.got)
+ .rela.got1 : { *(.rela.got1) }
+ .rela.got2 : { *(.rela.got2) }
+ .rela.got : { *(.rela.got) }
+ .rela.got : { *(.rela.got) }
+ .rela.got : { *(.rela.got) }
+ .rela.IA_64.pltoff : { *(.rela.IA_64.pltoff) }
+ *(.rela.init)
+ .rela.init : { *(.rela.init) }
+ .rela.init : { *(.rela.init) }
+ .rela.init : { *(.rela.init) }
+ *(.rela.iplt)
+ *(.rela.opd)
+ *(.rela.plt)
+ .rela.plt :
+ .rela.plt : { *(.rela.plt) }
+ .rela.plt : { *(.rela.plt) }
+ .rela.plt : { *(.rela.plt) }
+ .rela.rodata :
+ { *(.rela.rodata) *(.rela.gnu.linkonce.r*) }
+ *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*)
+ .rela.rodata : { *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*) }
+ *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*)
+ .rela.sbss2 : { *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*) }
+ *(.rela.sbss .rela.sbss.* .rela.gnu.linkonce.sb.*)
+ .rela.sbss : { *(.rela.sbss .rela.sbss.* .rela.gnu.linkonce.sb.*) }
+ *(.rela.sdata2 .rela.sdata2.* .rela.gnu.linkonce.s2.*)
+ .rela.sdata2 : { *(.rela.sdata2 .rela.sdata2.* .rela.gnu.linkonce.s2.*) }
+ *(.rela.sdata .rela.sdata.* .rela.gnu.linkonce.s.*)
+ .rela.sdata : { *(.rela.sdata .rela.sdata.* .rela.gnu.linkonce.s.*) }
+ *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*)
+ .rela.tbss : { *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*) }
+ .rela.tbss : { *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*) }
+ *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*)
+ .rela.tdata : { *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*) }
+ .rela.tdata : { *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*) }
+ .rela.text :
+ { *(.rela.text) *(.rela.gnu.linkonce.t*) }
+ *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*)
+ .rela.text : { *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*) }
+ *(.rela.toc)
+ .rela.tocbss : { *(.rela.tocbss) }
+ aSign
+ aSign ?
+ aSign = 0;
+ aSign, aExp + 0x3C00, ( aSig | LIT64( 0x0010000000000000 ) )<<11 );
+ aSign, aExp, aSig, 0 STATUS_VAR );
+ aSign = extractFloat128Sign( a );
+ aSign = extractFloat128Sign( a );
+ aSign = extractFloat16Sign(a);
+ aSign = extractFloat32Sign(a);
+ aSign = extractFloat32Sign( a );
+ aSign = extractFloat32Sign( a );
+ aSign = extractFloat64Sign(a);
+ aSign = extractFloat64Sign( a );
+ aSign = extractFloat64Sign( a );
+ aSign = extractFloat ## s ## Sign(a); \
+ aSign = extractFloat ## s ## Sign( a ); \
+ aSign = extractFloatx80Sign( a );
+ aSign = extractFloatx80Sign( a );
+ aSign ? le128( b.high, b.low, a.high, a.low )
+ aSign ? LIT64( 0x8000000000000000 ) : LIT64( 0x3FF0000000000000 ));
+ aSign ? lt128( b.high, b.low, a.high, a.low )
+ aSign ? packFloat128( 1, 0, 0, 0 )
+ aSign ? packFloat128( 1, 0x3FFF, 0, 0 )
+ aSign ? packFloatx80( 1, 0, 0 )
+ flag aSign;
+ flag aSign, bSign;
+ flag aSign, bSign; \
+ flag aSign, bSign; \
+ flag aSign, bSign, cSign, zSign;
+ flag aSign, bSign, zSign;
+ flag aSign, zSign;
+ if ( ( aExp == 0x7FF ) && aSig ) aSign = 0;
+ if ( ( aExp == 0x7FF ) && aSig ) aSign = 0;
+ if ( ( aExp == 0x7FFF ) && ( aSig0 | aSig1 ) ) aSign = 0;
+ if ( ( aExp == 0x7FFF ) && aSig0 ) aSign = 0;
+ if ( ( aExp == 0x7FFF ) && (uint64_t) ( aSig<<1 ) ) aSign = 0;
+ if ( ( aExp == 0x7FFF ) && (uint64_t) ( aSig<<1 ) ) aSign = 0;
+ if ( ( aExp == 0xFF ) && aSig ) aSign = 0;
+ if ( ( aSig0 | aSig1 ) == 0 ) return packFloatx80( aSign, 0, 0 );
+ if ( aSig == 0 ) return packFloat128( aSign, 0, 0, 0 );
+ if ( aSig == 0 ) return packFloat64( aSign, 0, 0 );
+ if ( aSig == 0 ) return packFloatx80( aSign, 0, 0 );
+ if ( aSign ) {
+ if ( ! aSign
+ if ( ! aSign
+ if ( ! aSign || ( ( aExp == 0x7FFF ) && aSig ) ) {
+ if ( ! aSign || ( ( aExp == 0x7FFF ) && ( aSig0 | aSig1 ) ) ) {
+ if ( ! aSign || ( ( aExp == 0xFF ) && aSig ) ) {
+ if ( ! aSign || ( ( aExp == 0xFF ) && aSig ) ) {
+ if ( ! aSign || ( ( aExp == 0xFF ) && aSig ) ) return 0x7FFFFFFF;
+ if (aSign != bSign) { \
+ if ( aSign == bSign ) {
+ if ( aSign != bSign ) {
+ if ( aSign != bSign ) { \
+ if ( aSign != bSign ) return aSign || ( (uint32_t) ( ( av | bv )<<1 ) == 0 );
+ if ( aSign != bSign ) return aSign && ( (uint32_t) ( ( av | bv )<<1 ) != 0 );
+ if ( aSign != bSign ) return aSign || ( (uint64_t) ( ( av | bv )<<1 ) == 0 );
+ if ( aSign != bSign ) return aSign && ( (uint64_t) ( ( av | bv )<<1 ) != 0 );
+ if ( ! aSign ) return a;
+ if ( aSign ) z = - z;
+ if ( ( (int16_t)z < 0 ) ^ aSign ) {
+ if ( ( z < 0 ) ^ aSign ) {
+ increment = aSign ? 0 : mask;
+ increment = aSign ? mask : 0;
+ normalizeRoundAndPackFloat128( aSign ^ zSign, bExp - 4, aSig0, aSig1 STATUS_VAR );
+ packFloatx80( aSign, 0x3FFF, LIT64( 0x8000000000000000 ) );
+ pSign = aSign ^ bSign;
+ return 1 - (2 * aSign);
+ return 1 - (2 * aSign); \
+ return 1 - 2 * (aSign ^ ( av < bv )); \
+ return 1 - 2 * (aSign ^ ( lt128( a.high, a.low, b.high, b.low ) ));
+ return addFloat128Sigs( a, b, aSign STATUS_VAR );
+ return addFloat32Sigs( a, b, aSign STATUS_VAR );
+ return addFloat32Sigs( a, b, aSign STATUS_VAR);
+ return addFloat64Sigs( a, b, aSign STATUS_VAR );
+ return addFloatx80Sigs( a, b, aSign STATUS_VAR );
+ return aSign ? a : b; \
+ return (aSign ^ (av < bv)) ? a : b; \
+ return (aSign ^ (av < bv)) ? b : a; \
+ return aSign ? b : a; \
+ return (aSign) ? float32_zero : a;
+ return aSign ? (int32_t) 0x80000000 : 0x7FFFFFFF;
+ return aSign ? (int32_t) 0xffff8000 : 0x7FFF;
+ return ( av == bv ) || ( aSign ^ ( av < bv ) );
+ return ( av != bv ) && ( aSign ^ ( av < bv ) );
+ return make_float32(aSign ? 0x80000000 : 0x3F800000);
+ return make_float32(aSign ? 0xBF800000 : 0);
+ return make_float64(aSign ? LIT64( 0xBFF0000000000000 ) : 0);
+ return normalizeRoundAndPackFloat128( aSign, aExp, aSig0, aSig1
+ return normalizeRoundAndPackFloat32( aSign, aExp, aSig STATUS_VAR );
+ return normalizeRoundAndPackFloat32( aSign ^ zSign, bExp, aSig STATUS_VAR );
+ return normalizeRoundAndPackFloat64( aSign, aExp, aSig STATUS_VAR );
+ return normalizeRoundAndPackFloat64( aSign ^ zSign, bExp, aSig STATUS_VAR );
+ return packFloat128( aSign, 0, 0, 0 );
+ return packFloat128( aSign, 0x3FFF, 0, 0 );
+ return packFloat128( aSign, 0x7FFF, 0, 0 );
+ return packFloat128( aSign, aExp + 0x3C00, zSig0, zSig1 );
+ return packFloat128( aSign, aExp + 0x3F80, ( (uint64_t) aSig )<<25, 0 );
+ return packFloat128( aSign, aExp, zSig0, zSig1 );
+ return packFloat16(aSign, 0, 0);
+ return packFloat16(aSign, 0, 0);
+ return packFloat16(aSign, 0x1f, 0);
+ return packFloat16(aSign, 0x1f, 0);
+ return packFloat16(aSign, 0x1f, 0x3ff);
+ return packFloat16(aSign, aExp + 14, aSig >> 13);
+ return packFloat32( aSign, 0, 0 );
+ return packFloat32(aSign, 0, 0);
+ return packFloat32( aSign, 0x7F, 0 );
+ return packFloat32( aSign, 0xFF, 0 );
+ return packFloat32(aSign, 0xff, aSig << 13);
+ return packFloat32( aSign, aExp + 0x70, aSig << 13);
+ return packFloat64( aSign, 0, 0 );
+ return packFloat64( aSign, 0x3FF, 0 );
+ return packFloat64( aSign, 0x7FF, 0 );
+ return packFloat64( aSign, aExp + 0x380, ( (uint64_t) aSig )<<29 );
+ return packFloatx80( aSign, 0, 0 );
+ return packFloatx80( aSign, 0x7FFF, LIT64( 0x8000000000000000 ) );
+ return packFloatx80( aSign, aExp + 0x3F80, ( (uint64_t) aSig )<<40 );
+ return roundAndPackFloat32( aSign, aExp, aSig STATUS_VAR );
+ return roundAndPackFloat32( aSign, aExp, zSig STATUS_VAR );
+ return roundAndPackFloat64( aSign, aExp, aSig0 STATUS_VAR );
+ return roundAndPackFloat64( aSign, aExp, zSig STATUS_VAR );
+ return roundAndPackFloatx80( 80, aSign, aExp, aSig0, aSig1 STATUS_VAR );
+ return roundAndPackInt32( aSign, aSig0 STATUS_VAR );
+ return roundAndPackInt32( aSign, aSig64 STATUS_VAR );
+ return roundAndPackInt32( aSign, aSig STATUS_VAR );
+ return roundAndPackInt64( aSign, aSig0, aSig1 STATUS_VAR );
+ return roundAndPackInt64( aSign, aSig64, aSigExtra STATUS_VAR );
+ return roundAndPackInt64( aSign, aSig, aSigExtra STATUS_VAR );
+ return subFloat128Sigs( a, b, aSign STATUS_VAR );
+ return subFloat32Sigs( a, b, aSign STATUS_VAR );
+ return subFloat64Sigs( a, b, aSign STATUS_VAR );
+ return subFloatx80Sigs( a, b, aSign STATUS_VAR );
+ zSign = aSign;
+ zSign = aSign ^ bSign;
+ char creator[8]; // "conectix"
+ if (buf_size >= 8 && !strncmp((char *)buf, "conectix", 8))
+ if (strncmp(footer->creator, "conectix", 8))
+ memcpy(footer->creator, "conectix", 8);
+void *xtensa_get_extint(CPUState *env, unsigned extint)
+ if (extint < env->config->nextint) {
+ unsigned irq = env->config->extint[extint];
+ __func__, extint);
+ unsigned extint[MAX_NINTERRUPT];
+void *xtensa_get_extint(CPUState *env, unsigned extint);
+ .extint = EXTINTS
+ * LINT0 delivery mode on CPU #0 is set to ExtInt at initialization
+ case 0x23: /* APON */
+ type = SVM_EVTINJ_TYPE_EXEPT;
+ case SVM_EVTINJ_TYPE_EXEPT:
+ qemu_log_mask(CPU_LOG_TB_IN_ASM, "EXEPT");
--
1.7.2.5
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [Qemu-devel] [PATCH 1/6] Add spelling exceptions for codespell
2011-12-09 23:19 ` [Qemu-devel] [PATCH 1/6] Add spelling exceptions for codespell Stefan Weil
@ 2011-12-10 0:49 ` Andreas Färber
2011-12-10 9:39 ` Stefan Weil
0 siblings, 1 reply; 10+ messages in thread
From: Andreas Färber @ 2011-12-10 0:49 UTC (permalink / raw)
To: Stefan Weil; +Cc: qemu-trivial, qemu-devel
Am 10.12.2011 00:19, schrieb Stefan Weil:
> This file can be used with codespell to suppress wrong
> misspelling reports.
>
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
> scripts/codespell.exclude | 215 +++++++++++++++++++++++++++++++++++++++++++++
> 1 files changed, 215 insertions(+), 0 deletions(-)
> create mode 100644 scripts/codespell.exclude
>
> diff --git a/scripts/codespell.exclude b/scripts/codespell.exclude
> new file mode 100644
> index 0000000..d69c946
> --- /dev/null
> +++ b/scripts/codespell.exclude
> @@ -0,0 +1,215 @@
> + .rela.bss : { *(.rela.bss) }
> + .rela.bss : { *(.rela.bss) }
[...]
I don't like this.
Instead I suggest to keep a word list (that isn't whitespace-sensitive)
and to generate the .exclude file via shell script (grep -r) on the fly.
Andreas
--
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [Qemu-devel] [PATCH 1/6] Add spelling exceptions for codespell
2011-12-10 0:49 ` Andreas Färber
@ 2011-12-10 9:39 ` Stefan Weil
0 siblings, 0 replies; 10+ messages in thread
From: Stefan Weil @ 2011-12-10 9:39 UTC (permalink / raw)
To: Andreas Färber; +Cc: qemu-trivial, qemu-devel
Am 10.12.2011 01:49, schrieb Andreas Färber:
> Am 10.12.2011 00:19, schrieb Stefan Weil:
>> This file can be used with codespell to suppress wrong
>> misspelling reports.
>>
>> Signed-off-by: Stefan Weil <sw@weilnetz.de>
>> ---
>> scripts/codespell.exclude | 215
>> +++++++++++++++++++++++++++++++++++++++++++++
>> 1 files changed, 215 insertions(+), 0 deletions(-)
>> create mode 100644 scripts/codespell.exclude
>>
>> diff --git a/scripts/codespell.exclude b/scripts/codespell.exclude
>> new file mode 100644
>> index 0000000..d69c946
>> --- /dev/null
>> +++ b/scripts/codespell.exclude
>> @@ -0,0 +1,215 @@
>> + .rela.bss : { *(.rela.bss) }
>> + .rela.bss : { *(.rela.bss) }
> [...]
>
> I don't like this.
>
> Instead I suggest to keep a word list (that isn't whitespace-sensitive)
> and to generate the .exclude file via shell script (grep -r) on the fly.
>
> Andreas
grep -w. The solution which you suggest would need a list of filenames
and words because those words are only accepted in the given files.
The resulting exception list would also suppress real misspellings
of the given words in the given files which is not what we want.
If this seems acceptable, the exception list can be created using
a small shell script.
I don't say that an exception list is a nice solution (I also don't like
it),
but that's the way codespell works with the Linux kernel code, too.
Yes, the list is whitespace sensitive, but even if whitespace of the
affected
lines is changed, that's not a big problem. You will get some false
misspelling reports and either ignore them or update the exception list.
We could also change the code to reduce the need for spelling exceptions.
Renaming the variable aSign (which is reported as misspelling of assign)
would reduce the exception list a lot.
Regards,
Stefan
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Qemu-devel] [PATCH 2/6] fmopl: Fix spelling in code and comments
2011-12-09 23:19 [Qemu-devel] [PATCH 0/6] New fixes for some misspellings Stefan Weil
2011-12-09 23:19 ` [Qemu-devel] [PATCH 1/6] Add spelling exceptions for codespell Stefan Weil
@ 2011-12-09 23:19 ` Stefan Weil
2011-12-09 23:19 ` [Qemu-devel] [PATCH 3/6] hw: Fix spelling (licenced->licensed) Stefan Weil
` (4 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Stefan Weil @ 2011-12-09 23:19 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Stefan Weil
algorythm->algorithm
rythm->rhythm
I did not try to fix the coding standard, so checkpatch.pl
reports lots of violations.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
hw/fmopl.c | 32 ++++++++++++++++----------------
hw/fmopl.h | 4 ++--
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/hw/fmopl.c b/hw/fmopl.c
index 5ad52ab..431f736 100644
--- a/hw/fmopl.c
+++ b/hw/fmopl.c
@@ -362,8 +362,8 @@ INLINE UINT32 OPL_CALC_SLOT( OPL_SLOT *SLOT )
return SLOT->TLL+ENV_CURVE[SLOT->evc>>ENV_BITS]+(SLOT->ams ? ams : 0);
}
-/* set algorythm connection */
-static void set_algorythm( OPL_CH *CH)
+/* set algorithm connection */
+static void set_algorithm( OPL_CH *CH)
{
INT32 *carrier = &outd[0];
CH->connect1 = CH->CON ? carrier : &feedback2;
@@ -498,7 +498,7 @@ INLINE void OPL_CALC_CH( OPL_CH *CH )
}
}
-/* ---------- calcrate rythm block ---------- */
+/* ---------- calcrate rhythm block ---------- */
#define WHITE_NOISE_db 6.0
INLINE void OPL_CALC_RH( OPL_CH *CH )
{
@@ -895,14 +895,14 @@ static void OPLWriteReg(FM_OPL *OPL, int r, int v)
case 0xbd:
/* amsep,vibdep,r,bd,sd,tom,tc,hh */
{
- UINT8 rkey = OPL->rythm^v;
+ UINT8 rkey = OPL->rhythm^v;
OPL->ams_table = &AMS_TABLE[v&0x80 ? AMS_ENT : 0];
OPL->vib_table = &VIB_TABLE[v&0x40 ? VIB_ENT : 0];
- OPL->rythm = v&0x3f;
- if(OPL->rythm&0x20)
+ OPL->rhythm = v&0x3f;
+ if(OPL->rhythm&0x20)
{
#if 0
- usrintf_showmessage("OPL Rythm mode select");
+ usrintf_showmessage("OPL Rhythm mode select");
#endif
/* BD key on/off */
if(rkey&0x10)
@@ -995,7 +995,7 @@ static void OPLWriteReg(FM_OPL *OPL, int r, int v)
int feedback = (v>>1)&7;
CH->FB = feedback ? (8+1) - feedback : 0;
CH->CON = v&1;
- set_algorythm(CH);
+ set_algorithm(CH);
}
return;
case 0xe0: /* wave type */
@@ -1049,7 +1049,7 @@ void YM3812UpdateOne(FM_OPL *OPL, INT16 *buffer, int length)
OPLSAMPLE *buf = buffer;
UINT32 amsCnt = OPL->amsCnt;
UINT32 vibCnt = OPL->vibCnt;
- UINT8 rythm = OPL->rythm&0x20;
+ UINT8 rhythm = OPL->rhythm&0x20;
OPL_CH *CH,*R_CH;
if( (void *)OPL != cur_chip ){
@@ -1057,7 +1057,7 @@ void YM3812UpdateOne(FM_OPL *OPL, INT16 *buffer, int length)
/* channel pointers */
S_CH = OPL->P_CH;
E_CH = &S_CH[9];
- /* rythm slot */
+ /* rhythm slot */
SLOT7_1 = &S_CH[7].SLOT[SLOT1];
SLOT7_2 = &S_CH[7].SLOT[SLOT2];
SLOT8_1 = &S_CH[8].SLOT[SLOT1];
@@ -1068,7 +1068,7 @@ void YM3812UpdateOne(FM_OPL *OPL, INT16 *buffer, int length)
ams_table = OPL->ams_table;
vib_table = OPL->vib_table;
}
- R_CH = rythm ? &S_CH[6] : E_CH;
+ R_CH = rhythm ? &S_CH[6] : E_CH;
for( i=0; i < length ; i++ )
{
/* channel A channel B channel C */
@@ -1080,7 +1080,7 @@ void YM3812UpdateOne(FM_OPL *OPL, INT16 *buffer, int length)
for(CH=S_CH ; CH < R_CH ; CH++)
OPL_CALC_CH(CH);
/* Rythn part */
- if(rythm)
+ if(rhythm)
OPL_CALC_RH(S_CH);
/* limit check */
data = Limit( outd[0] , OPL_MAXOUT, OPL_MINOUT );
@@ -1110,7 +1110,7 @@ void Y8950UpdateOne(FM_OPL *OPL, INT16 *buffer, int length)
OPLSAMPLE *buf = buffer;
UINT32 amsCnt = OPL->amsCnt;
UINT32 vibCnt = OPL->vibCnt;
- UINT8 rythm = OPL->rythm&0x20;
+ UINT8 rhythm = OPL->rhythm&0x20;
OPL_CH *CH,*R_CH;
YM_DELTAT *DELTAT = OPL->deltat;
@@ -1122,7 +1122,7 @@ void Y8950UpdateOne(FM_OPL *OPL, INT16 *buffer, int length)
/* channel pointers */
S_CH = OPL->P_CH;
E_CH = &S_CH[9];
- /* rythm slot */
+ /* rhythm slot */
SLOT7_1 = &S_CH[7].SLOT[SLOT1];
SLOT7_2 = &S_CH[7].SLOT[SLOT2];
SLOT8_1 = &S_CH[8].SLOT[SLOT1];
@@ -1133,7 +1133,7 @@ void Y8950UpdateOne(FM_OPL *OPL, INT16 *buffer, int length)
ams_table = OPL->ams_table;
vib_table = OPL->vib_table;
}
- R_CH = rythm ? &S_CH[6] : E_CH;
+ R_CH = rhythm ? &S_CH[6] : E_CH;
for( i=0; i < length ; i++ )
{
/* channel A channel B channel C */
@@ -1148,7 +1148,7 @@ void Y8950UpdateOne(FM_OPL *OPL, INT16 *buffer, int length)
for(CH=S_CH ; CH < R_CH ; CH++)
OPL_CALC_CH(CH);
/* Rythn part */
- if(rythm)
+ if(rhythm)
OPL_CALC_RH(S_CH);
/* limit check */
data = Limit( outd[0] , OPL_MAXOUT, OPL_MINOUT );
diff --git a/hw/fmopl.h b/hw/fmopl.h
index a01ff90..24ba5f4 100644
--- a/hw/fmopl.h
+++ b/hw/fmopl.h
@@ -110,8 +110,8 @@ typedef struct fm_opl_f {
/* FM channel slots */
OPL_CH *P_CH; /* pointer of CH */
int max_ch; /* maximum channel */
- /* Rythm sention */
- UINT8 rythm; /* Rythm mode , key flag */
+ /* Rhythm sention */
+ UINT8 rhythm; /* Rhythm mode , key flag */
#if BUILD_Y8950
/* Delta-T ADPCM unit (Y8950) */
YM_DELTAT *deltat; /* DELTA-T ADPCM */
--
1.7.2.5
^ permalink raw reply related [flat|nested] 10+ messages in thread* [Qemu-devel] [PATCH 3/6] hw: Fix spelling (licenced->licensed)
2011-12-09 23:19 [Qemu-devel] [PATCH 0/6] New fixes for some misspellings Stefan Weil
2011-12-09 23:19 ` [Qemu-devel] [PATCH 1/6] Add spelling exceptions for codespell Stefan Weil
2011-12-09 23:19 ` [Qemu-devel] [PATCH 2/6] fmopl: Fix spelling in code and comments Stefan Weil
@ 2011-12-09 23:19 ` Stefan Weil
2011-12-09 23:19 ` [Qemu-devel] [PATCH 4/6] hw: Fix spelling in comments Stefan Weil
` (3 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Stefan Weil @ 2011-12-09 23:19 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Stefan Weil
New code introduced old misspellings.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
hw/lm4549.c | 2 +-
hw/lm4549.h | 2 +-
hw/pl041.c | 2 +-
hw/pl041.h | 2 +-
hw/pl041.hx | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/hw/lm4549.c b/hw/lm4549.c
index 4d5b831..80b3ec4 100644
--- a/hw/lm4549.c
+++ b/hw/lm4549.c
@@ -4,7 +4,7 @@
* Copyright (c) 2011
* Written by Mathieu Sonet - www.elasticsheep.com
*
- * This code is licenced under the GPL.
+ * This code is licensed under the GPL.
*
* *****************************************************************
*
diff --git a/hw/lm4549.h b/hw/lm4549.h
index 70d0ac1..5948780 100644
--- a/hw/lm4549.h
+++ b/hw/lm4549.h
@@ -4,7 +4,7 @@
* Copyright (c) 2011
* Written by Mathieu Sonet - www.elasticsheep.com
*
- * This code is licenced under the GPL.
+ * This code is licensed under the GPL.
*
* *****************************************************************
*/
diff --git a/hw/pl041.c b/hw/pl041.c
index d8e55d1..4585ccf 100644
--- a/hw/pl041.c
+++ b/hw/pl041.c
@@ -4,7 +4,7 @@
* Copyright (c) 2011
* Written by Mathieu Sonet - www.elasticsheep.com
*
- * This code is licenced under the GPL.
+ * This code is licensed under the GPL.
*
* *****************************************************************
*
diff --git a/hw/pl041.h b/hw/pl041.h
index 1f22432..427ab6d 100644
--- a/hw/pl041.h
+++ b/hw/pl041.h
@@ -4,7 +4,7 @@
* Copyright (c) 2011
* Written by Mathieu Sonet - www.elasticsheep.com
*
- * This code is licenced under the GPL.
+ * This code is licensed under the GPL.
*
* *****************************************************************
*/
diff --git a/hw/pl041.hx b/hw/pl041.hx
index e972996..dd7188c 100644
--- a/hw/pl041.hx
+++ b/hw/pl041.hx
@@ -4,7 +4,7 @@
* Copyright (c) 2011
* Written by Mathieu Sonet - www.elasticsheep.com
*
- * This code is licenced under the GPL.
+ * This code is licensed under the GPL.
*
* *****************************************************************
*/
--
1.7.2.5
^ permalink raw reply related [flat|nested] 10+ messages in thread* [Qemu-devel] [PATCH 4/6] hw: Fix spelling in comments
2011-12-09 23:19 [Qemu-devel] [PATCH 0/6] New fixes for some misspellings Stefan Weil
` (2 preceding siblings ...)
2011-12-09 23:19 ` [Qemu-devel] [PATCH 3/6] hw: Fix spelling (licenced->licensed) Stefan Weil
@ 2011-12-09 23:19 ` Stefan Weil
2011-12-09 23:19 ` [Qemu-devel] [PATCH 5/6] hw: Fix spelling in comments and code Stefan Weil
` (2 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Stefan Weil @ 2011-12-09 23:19 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Stefan Weil
adress->address
advertisment->advertisement
begining->beginning
bondary->boundary
controler->controller
controll->control
convertion->conversion
doesnt->doesn't
existant->existent
instuction->instruction
loosing->losing
managment->management
multipled->multiplied
negotation->negotiation
runing->running
teh->the
unchangable->unchangeable
writen->written
yeild->yield
Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
hw/9pfs/virtio-9p-coth.h | 2 +-
hw/9pfs/virtio-9p-handle.c | 2 +-
hw/alpha_dp264.c | 2 +-
hw/arm_gic.c | 2 +-
hw/bt-hci-csr.c | 2 +-
hw/e1000_hw.h | 2 +-
hw/etraxfs_dma.c | 2 +-
hw/etraxfs_pic.c | 2 +-
hw/fmopl.c | 8 ++++----
hw/gusemu.h | 2 +-
hw/gusemu_hal.c | 2 +-
hw/ide/core.c | 2 +-
hw/lan9118.c | 4 ++--
hw/pcie_aer.c | 2 +-
hw/pl110.c | 2 +-
hw/rtl8139.c | 2 +-
hw/sh7750_regs.h | 2 +-
hw/spapr.h | 2 +-
hw/ssd0303.c | 2 +-
hw/wdt_ib700.c | 2 +-
20 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/hw/9pfs/virtio-9p-coth.h b/hw/9pfs/virtio-9p-coth.h
index c4b74b0..c31c965 100644
--- a/hw/9pfs/virtio-9p-coth.h
+++ b/hw/9pfs/virtio-9p-coth.h
@@ -44,7 +44,7 @@ typedef struct V9fsThPool {
qemu_coroutine_self()); \
qemu_bh_schedule(co_bh); \
/* \
- * yeild in qemu thread and re-enter back \
+ * yield in qemu thread and re-enter back \
* in glib worker thread \
*/ \
qemu_coroutine_yield(); \
diff --git a/hw/9pfs/virtio-9p-handle.c b/hw/9pfs/virtio-9p-handle.c
index f97d898..9518bfe 100644
--- a/hw/9pfs/virtio-9p-handle.c
+++ b/hw/9pfs/virtio-9p-handle.c
@@ -520,7 +520,7 @@ static int handle_name_to_path(FsContext *ctx, V9fsPath *dir_path,
}
fh = g_malloc(sizeof(struct file_handle) + data->handle_bytes);
fh->handle_bytes = data->handle_bytes;
- /* add a "./" at the begining of the path */
+ /* add a "./" at the beginning of the path */
snprintf(buffer, PATH_MAX, "./%s", name);
/* flag = 0 imply don't follow symlink */
ret = name_to_handle(dirfd, buffer, fh, &mnt_id, 0);
diff --git a/hw/alpha_dp264.c b/hw/alpha_dp264.c
index fcc20e9..598b830 100644
--- a/hw/alpha_dp264.c
+++ b/hw/alpha_dp264.c
@@ -2,7 +2,7 @@
* QEMU Alpha DP264/CLIPPER hardware system emulator.
*
* Choose CLIPPER IRQ mappings over, say, DP264, MONET, or WEBBRICK
- * variants because CLIPPER doesn't have an SMC669 SuperIO controler
+ * variants because CLIPPER doesn't have an SMC669 SuperIO controller
* that we need to emulate as well.
*/
diff --git a/hw/arm_gic.c b/hw/arm_gic.c
index 527c9ce..1a896fb 100644
--- a/hw/arm_gic.c
+++ b/hw/arm_gic.c
@@ -602,7 +602,7 @@ static uint32_t gic_cpu_read(gic_state *s, int cpu, int offset)
return 0;
case 0x0c: /* Acknowledge */
return gic_acknowledge_irq(s, cpu);
- case 0x14: /* Runing Priority */
+ case 0x14: /* Running Priority */
return s->running_priority[cpu];
case 0x18: /* Highest Pending Interrupt */
return s->current_pending[cpu];
diff --git a/hw/bt-hci-csr.c b/hw/bt-hci-csr.c
index 0dcf897..772b677 100644
--- a/hw/bt-hci-csr.c
+++ b/hw/bt-hci-csr.c
@@ -222,7 +222,7 @@ static void csrhci_in_packet(struct csrhci_s *s, uint8_t *pkt)
rpkt = csrhci_out_packet_csr(s, H4_NEG_PKT, 10);
- *rpkt ++ = 0x20; /* Operational settings negotation Ok */
+ *rpkt ++ = 0x20; /* Operational settings negotiation Ok */
memcpy(rpkt, pkt, 7); rpkt += 7;
*rpkt ++ = 0xff;
*rpkt = 0xff;
diff --git a/hw/e1000_hw.h b/hw/e1000_hw.h
index 2e341ac..9e29af8 100644
--- a/hw/e1000_hw.h
+++ b/hw/e1000_hw.h
@@ -295,7 +295,7 @@
#define E1000_KUMCTRLSTA 0x00034 /* MAC-PHY interface - RW */
#define E1000_MDPHYA 0x0003C /* PHY address - RW */
-#define E1000_MANC2H 0x05860 /* Managment Control To Host - RW */
+#define E1000_MANC2H 0x05860 /* Management Control To Host - RW */
#define E1000_SW_FW_SYNC 0x05B5C /* Software-Firmware Synchronization - RW */
#define E1000_GCR 0x05B00 /* PCI-Ex Control */
diff --git a/hw/etraxfs_dma.c b/hw/etraxfs_dma.c
index 02d0183..d2bd584 100644
--- a/hw/etraxfs_dma.c
+++ b/hw/etraxfs_dma.c
@@ -180,7 +180,7 @@ struct fs_dma_channel
struct dma_descr_context current_c;
struct dma_descr_data current_d;
- /* Controll registers. */
+ /* Control registers. */
uint32_t regs[DMA_REG_MAX];
};
diff --git a/hw/etraxfs_pic.c b/hw/etraxfs_pic.c
index 72cbdb8..993d6a8 100644
--- a/hw/etraxfs_pic.c
+++ b/hw/etraxfs_pic.c
@@ -53,7 +53,7 @@ static void pic_update(struct etrax_pic *fs)
fs->regs[R_R_MASKED_VECT] = fs->regs[R_R_VECT] & fs->regs[R_RW_MASK];
- /* The ETRAX interrupt controller signals interrupts to teh core
+ /* The ETRAX interrupt controller signals interrupts to the core
through an interrupt request wire and an irq vector bus. If
multiple interrupts are simultaneously active it chooses vector
0x30 and lets the sw choose the priorities. */
diff --git a/hw/fmopl.c b/hw/fmopl.c
index 431f736..734d2f4 100644
--- a/hw/fmopl.c
+++ b/hw/fmopl.c
@@ -715,7 +715,7 @@ static void OPLCloseTable( void )
free(VIB_TABLE);
}
-/* CSM Key Controll */
+/* CSM Key Control */
INLINE void CSMKeyControll(OPL_CH *CH)
{
OPL_SLOT *slot1 = &CH->SLOT[SLOT1];
@@ -762,7 +762,7 @@ static void OPLWriteReg(FM_OPL *OPL, int r, int v)
switch(r&0xe0)
{
- case 0x00: /* 00-1f:controll */
+ case 0x00: /* 00-1f:control */
switch(r&0x1f)
{
case 0x01:
@@ -826,7 +826,7 @@ static void OPLWriteReg(FM_OPL *OPL, int r, int v)
LOG(LOG_WAR,("OPL:write unmapped KEYBOARD port\n"));
}
return;
- case 0x07: /* DELTA-T controll : START,REC,MEMDATA,REPT,SPOFF,x,x,RST */
+ case 0x07: /* DELTA-T control : START,REC,MEMDATA,REPT,SPOFF,x,x,RST */
if(OPL->type&OPL_TYPE_ADPCM)
YM_DELTAT_ADPCM_Write(OPL->deltat,r-0x07,v);
return;
@@ -1380,7 +1380,7 @@ int OPLTimerOver(FM_OPL *OPL,int c)
else
{ /* Timer A */
OPL_STATUS_SET(OPL,0x40);
- /* CSM mode key,TL controll */
+ /* CSM mode key,TL control */
if( OPL->mode & 0x80 )
{ /* CSM mode total level latch and auto key on */
int ch;
diff --git a/hw/gusemu.h b/hw/gusemu.h
index 5093767..27877c0 100644
--- a/hw/gusemu.h
+++ b/hw/gusemu.h
@@ -27,7 +27,7 @@
/* data types (need to be adjusted if neither a VC6 nor a C99 compatible compiler is used) */
-#if defined _WIN32 && defined _MSC_VER /* doesnt support other win32 compilers yet, do it yourself... */
+#if defined _WIN32 && defined _MSC_VER /* doesn't support other win32 compilers yet, do it yourself... */
typedef unsigned char GUSbyte;
typedef unsigned short GUSword;
typedef unsigned int GUSdword;
diff --git a/hw/gusemu_hal.c b/hw/gusemu_hal.c
index c6f9537..582779f 100644
--- a/hw/gusemu_hal.c
+++ b/hw/gusemu_hal.c
@@ -517,7 +517,7 @@ void gus_dma_transferdata(GUSEmuState * state, char *dma_addr, unsigned int coun
int offset = (GUSregw(GUS42DMAStart) << 4) + (GUSregb(GUS50DMAHigh) & 0xf);
if (state->gusdma >= 4)
offset = (offset & 0xc0000) + (2 * (offset & 0x1fff0)); /* 16 bit address translation */
- destaddr = (char *) state->himemaddr + offset; /* wavetable RAM adress */
+ destaddr = (char *) state->himemaddr + offset; /* wavetable RAM address */
}
GUSregw(GUS42DMAStart) += (GUSword) (count >> 4); /* ToDo: add 16bit GUS page limit? */
diff --git a/hw/ide/core.c b/hw/ide/core.c
index 93a1a68..49847bd 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -1000,7 +1000,7 @@ void ide_exec_cmd(IDEBus *bus, uint32_t val)
printf("ide: CMD=%02x\n", val);
#endif
s = idebus_active_if(bus);
- /* ignore commands to non existant slave */
+ /* ignore commands to non existent slave */
if (s != bus->ifs && !s->bs)
return;
diff --git a/hw/lan9118.c b/hw/lan9118.c
index ee8b2ea..7e64c5d 100644
--- a/hw/lan9118.c
+++ b/hw/lan9118.c
@@ -697,7 +697,7 @@ static uint32_t do_phy_read(lan9118_state *s, int reg)
return 0x0007;
case 3: /* ID2 */
return 0xc0d1;
- case 4: /* Auto-neg advertisment */
+ case 4: /* Auto-neg advertisement */
return s->phy_advertise;
case 5: /* Auto-neg Link Partner Ability */
return 0x0f71;
@@ -731,7 +731,7 @@ static void do_phy_write(lan9118_state *s, int reg, uint32_t val)
s->phy_status |= 0x0020;
}
break;
- case 4: /* Auto-neg advertisment */
+ case 4: /* Auto-neg advertisement */
s->phy_advertise = (val & 0x2d7f) | 0x80;
break;
/* TODO 17, 18, 27, 31 */
diff --git a/hw/pcie_aer.c b/hw/pcie_aer.c
index 62c06ea..b9d1097 100644
--- a/hw/pcie_aer.c
+++ b/hw/pcie_aer.c
@@ -826,7 +826,7 @@ typedef struct PCIEAERErrorName {
} PCIEAERErrorName;
/*
- * AER error name -> value convertion table
+ * AER error name -> value conversion table
* This naming scheme is same to linux aer-injection tool.
*/
static const struct PCIEAERErrorName pcie_aer_error_list[] = {
diff --git a/hw/pl110.c b/hw/pl110.c
index 7aef8a4..cc1eb6d 100644
--- a/hw/pl110.c
+++ b/hw/pl110.c
@@ -358,7 +358,7 @@ static void pl110_write(void *opaque, target_phys_addr_t offset,
int n;
/* For simplicity invalidate the display whenever a control register
- is writen to. */
+ is written to. */
s->invalidate = 1;
if (offset >= 0x200 && offset < 0x400) {
/* Pallette. */
diff --git a/hw/rtl8139.c b/hw/rtl8139.c
index aa8ed0a..8aace9a 100644
--- a/hw/rtl8139.c
+++ b/hw/rtl8139.c
@@ -2662,7 +2662,7 @@ static void rtl8139_IntrStatus_write(RTL8139State *s, uint32_t val)
* Computing if we miss an interrupt here is not that correct but
* considered that we should have had already an interrupt
* and probably emulated is slower is better to assume this resetting was
- * done before testing on previous rtl8139_update_irq lead to IRQ loosing
+ * done before testing on previous rtl8139_update_irq lead to IRQ losing
*/
rtl8139_set_next_tctr_time(s, qemu_get_clock_ns(vm_clock));
rtl8139_update_irq(s);
diff --git a/hw/sh7750_regs.h b/hw/sh7750_regs.h
index 6ec13ab..534aa48 100644
--- a/hw/sh7750_regs.h
+++ b/hw/sh7750_regs.h
@@ -157,7 +157,7 @@
* Exeption-related registers
*/
-/* Immediate data for TRAPA instuction - TRA */
+/* Immediate data for TRAPA instruction - TRA */
#define SH7750_TRA_REGOFS 0x000020 /* offset */
#define SH7750_TRA SH7750_P4_REG32(SH7750_TRA_REGOFS)
#define SH7750_TRA_A7 SH7750_A7_REG32(SH7750_TRA_REGOFS)
diff --git a/hw/spapr.h b/hw/spapr.h
index df88f6a..d624841 100644
--- a/hw/spapr.h
+++ b/hw/spapr.h
@@ -141,7 +141,7 @@ typedef struct sPAPREnvironment {
#define H_DABRX_KERNEL (1ULL<<(63-62))
#define H_DABRX_USER (1ULL<<(63-63))
-/* Each control block has to be on a 4K bondary */
+/* Each control block has to be on a 4K boundary */
#define H_CB_ALIGNMENT 4096
/* pSeries hypervisor opcodes */
diff --git a/hw/ssd0303.c b/hw/ssd0303.c
index 401fdf5..bcad7bf 100644
--- a/hw/ssd0303.c
+++ b/hw/ssd0303.c
@@ -123,7 +123,7 @@ static int ssd0303_send(i2c_slave *i2c, uint8_t data)
case 0xa7: /* Inverse on. */
s->inverse = 1;
break;
- case 0xa8: /* Set multipled ratio (Ignored). */
+ case 0xa8: /* Set multiplied ratio (Ignored). */
s->cmd_state = SSD0303_CMD_SKIP1;
break;
case 0xad: /* DC-DC power control. */
diff --git a/hw/wdt_ib700.c b/hw/wdt_ib700.c
index 81f22d0..ba1d92d 100644
--- a/hw/wdt_ib700.c
+++ b/hw/wdt_ib700.c
@@ -42,7 +42,7 @@ typedef struct IB700state {
/* This is the timer. We use a global here because the watchdog
* code ensures there is only one watchdog (it is located at a fixed,
- * unchangable IO port, so there could only ever be one anyway).
+ * unchangeable IO port, so there could only ever be one anyway).
*/
/* A write to this register enables the timer. */
--
1.7.2.5
^ permalink raw reply related [flat|nested] 10+ messages in thread* [Qemu-devel] [PATCH 5/6] hw: Fix spelling in comments and code
2011-12-09 23:19 [Qemu-devel] [PATCH 0/6] New fixes for some misspellings Stefan Weil
` (3 preceding siblings ...)
2011-12-09 23:19 ` [Qemu-devel] [PATCH 4/6] hw: Fix spelling in comments Stefan Weil
@ 2011-12-09 23:19 ` Stefan Weil
2011-12-09 23:19 ` [Qemu-devel] [PATCH 6/6] Fix spelling in comments, documentation and messages Stefan Weil
2011-12-14 11:11 ` [Qemu-devel] [Qemu-trivial] [PATCH 0/6] New fixes for some misspellings Stefan Hajnoczi
6 siblings, 0 replies; 10+ messages in thread
From: Stefan Weil @ 2011-12-09 23:19 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Stefan Weil
compatiblity->compatibility
transfered->transferred
transfering->transferring
Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
hw/cirrus_vga.c | 2 +-
hw/es1370.c | 14 +++++++-------
hw/gusemu.h | 2 +-
hw/gusemu_hal.c | 2 +-
hw/omap2.c | 6 +++---
hw/pc.c | 2 +-
hw/pl181.c | 4 ++--
7 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c
index c7e365b..1b216e8 100644
--- a/hw/cirrus_vga.c
+++ b/hw/cirrus_vga.c
@@ -783,7 +783,7 @@ static void cirrus_bitblt_cputovideo_next(CirrusVGAState * s)
s->cirrus_srccounter -= s->cirrus_blt_srcpitch;
if (s->cirrus_srccounter <= 0)
goto the_end;
- /* more bytes than needed can be transfered because of
+ /* more bytes than needed can be transferred because of
word alignment, so we keep them for the next line */
/* XXX: keep alignment to speed up transfer */
end_ptr = s->cirrus_bltbuf + s->cirrus_blt_srcpitch;
diff --git a/hw/es1370.c b/hw/es1370.c
index c5c16b0..6a3ba55 100644
--- a/hw/es1370.c
+++ b/hw/es1370.c
@@ -788,7 +788,7 @@ static void es1370_transfer_audio (ES1370State *s, struct chan *d, int loop_sel,
int cnt = d->frame_cnt >> 16;
int size = d->frame_cnt & 0xffff;
int left = ((size - cnt + 1) << 2) + d->leftover;
- int transfered = 0;
+ int transferred = 0;
int temp = audio_MIN (max, audio_MIN (left, csc_bytes));
int index = d - &s->chan[0];
@@ -807,7 +807,7 @@ static void es1370_transfer_audio (ES1370State *s, struct chan *d, int loop_sel,
temp -= acquired;
addr += acquired;
- transfered += acquired;
+ transferred += acquired;
}
}
else {
@@ -823,11 +823,11 @@ static void es1370_transfer_audio (ES1370State *s, struct chan *d, int loop_sel,
break;
temp -= copied;
addr += copied;
- transfered += copied;
+ transferred += copied;
}
}
- if (csc_bytes == transfered) {
+ if (csc_bytes == transferred) {
*irq = 1;
d->scount = sc | (sc << 16);
ldebug ("sc = %d, rate = %f\n",
@@ -836,10 +836,10 @@ static void es1370_transfer_audio (ES1370State *s, struct chan *d, int loop_sel,
}
else {
*irq = 0;
- d->scount = sc | (((csc_bytes - transfered - 1) >> d->shift) << 16);
+ d->scount = sc | (((csc_bytes - transferred - 1) >> d->shift) << 16);
}
- cnt += (transfered + d->leftover) >> 2;
+ cnt += (transferred + d->leftover) >> 2;
if (s->sctl & loop_sel) {
/* Bah, how stupid is that having a 0 represent true value?
@@ -853,7 +853,7 @@ static void es1370_transfer_audio (ES1370State *s, struct chan *d, int loop_sel,
d->frame_cnt |= cnt << 16;
}
- d->leftover = (transfered + d->leftover) & 3;
+ d->leftover = (transferred + d->leftover) & 3;
}
static void es1370_run_channel (ES1370State *s, size_t chan, int free_or_avail)
diff --git a/hw/gusemu.h b/hw/gusemu.h
index 27877c0..331bb6f 100644
--- a/hw/gusemu.h
+++ b/hw/gusemu.h
@@ -83,7 +83,7 @@ void gus_dma_transferdata(GUSEmuState *state, char *dma_addr, unsigned int count
/* it is possible to break down a single transfer into multiple ones, but take care that: */
/* -dma_count is actually count-1 */
/* -before and during a transfer, DREQ is set and TC cleared */
-/* -when calling gus_dma_transferdata(), TC is only set true for call transfering the last byte */
+/* -when calling gus_dma_transferdata(), TC is only set true for call transferring the last byte */
/* -after the last transfer, DREQ is cleared and TC is set */
/* ** GF1 mixer emulation functions: */
diff --git a/hw/gusemu_hal.c b/hw/gusemu_hal.c
index 582779f..6096690 100644
--- a/hw/gusemu_hal.c
+++ b/hw/gusemu_hal.c
@@ -502,7 +502,7 @@ void gus_dma_transferdata(GUSEmuState * state, char *dma_addr, unsigned int coun
/* this function gets called by the callback function as soon as a DMA transfer is about to start
* dma_addr is a translated address within accessible memory, not the physical one,
* count is (real dma count register)+1
- * note that the amount of bytes transfered is fully determined by values in the DMA registers
+ * note that the amount of bytes transferred is fully determined by values in the DMA registers
* do not forget to update DMA states after transferring the entire block:
* DREQ cleared & TC asserted after the _whole_ transfer */
diff --git a/hw/omap2.c b/hw/omap2.c
index 91577ae..c09c04a 100644
--- a/hw/omap2.c
+++ b/hw/omap2.c
@@ -1616,7 +1616,7 @@ static void omap_prcm_write(void *opaque, target_phys_addr_t addr,
case 0x500: /* CM_CLKEN_PLL */
if (value & 0xffffff30)
fprintf(stderr, "%s: write 0s in CM_CLKEN_PLL for "
- "future compatiblity\n", __FUNCTION__);
+ "future compatibility\n", __FUNCTION__);
if ((s->clken[9] ^ value) & 0xcc) {
s->clken[9] &= ~0xcc;
s->clken[9] |= value & 0xcc;
@@ -1635,7 +1635,7 @@ static void omap_prcm_write(void *opaque, target_phys_addr_t addr,
case 0x540: /* CM_CLKSEL1_PLL */
if (value & 0xfc4000d7)
fprintf(stderr, "%s: write 0s in CM_CLKSEL1_PLL for "
- "future compatiblity\n", __FUNCTION__);
+ "future compatibility\n", __FUNCTION__);
if ((s->clksel[5] ^ value) & 0x003fff00) {
s->clksel[5] = value & 0x03bfff28;
omap_prcm_dpll_update(s);
@@ -1647,7 +1647,7 @@ static void omap_prcm_write(void *opaque, target_phys_addr_t addr,
case 0x544: /* CM_CLKSEL2_PLL */
if (value & ~3)
fprintf(stderr, "%s: write 0s in CM_CLKSEL2_PLL[31:2] for "
- "future compatiblity\n", __FUNCTION__);
+ "future compatibility\n", __FUNCTION__);
if (s->clksel[6] != (value & 3)) {
s->clksel[6] = value & 3;
omap_prcm_dpll_update(s);
diff --git a/hw/pc.c b/hw/pc.c
index 33778fe..b6dcba2 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -983,7 +983,7 @@ void pc_memory_init(MemoryRegion *system_memory,
linux_boot = (kernel_filename != NULL);
/* Allocate RAM. We allocate it as a single memory region and use
- * aliases to address portions of it, mostly for backwards compatiblity
+ * aliases to address portions of it, mostly for backwards compatibility
* with older qemus that used qemu_ram_alloc().
*/
ram = g_malloc(sizeof(*ram));
diff --git a/hw/pl181.c b/hw/pl181.c
index 46855f6..d05bc19 100644
--- a/hw/pl181.c
+++ b/hw/pl181.c
@@ -311,9 +311,9 @@ static uint64_t pl181_read(void *opaque, target_phys_addr_t offset,
case 0x48: /* FifoCnt */
/* The documentation is somewhat vague about exactly what FifoCnt
does. On real hardware it appears to be when decrememnted
- when a word is transfered between the FIFO and the serial
+ when a word is transferred between the FIFO and the serial
data engine. DataCnt is decremented after each byte is
- transfered between the serial engine and the card.
+ transferred between the serial engine and the card.
We don't emulate this level of detail, so both can be the same. */
tmp = (s->datacnt + 3) >> 2;
if (s->linux_hack) {
--
1.7.2.5
^ permalink raw reply related [flat|nested] 10+ messages in thread* [Qemu-devel] [PATCH 6/6] Fix spelling in comments, documentation and messages
2011-12-09 23:19 [Qemu-devel] [PATCH 0/6] New fixes for some misspellings Stefan Weil
` (4 preceding siblings ...)
2011-12-09 23:19 ` [Qemu-devel] [PATCH 5/6] hw: Fix spelling in comments and code Stefan Weil
@ 2011-12-09 23:19 ` Stefan Weil
2011-12-14 11:11 ` [Qemu-devel] [Qemu-trivial] [PATCH 0/6] New fixes for some misspellings Stefan Hajnoczi
6 siblings, 0 replies; 10+ messages in thread
From: Stefan Weil @ 2011-12-09 23:19 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Stefan Weil
accidently->accidentally
annother->another
choosen->chosen
consideres->considers
decriptor->descriptor
developement->development
paramter->parameter
preceed->precede
preceeding->preceding
priviledge->privilege
propogation->propagation
substraction->subtraction
throught->through
upto->up to
usefull->useful
Fix also grammar in posix-aio-compat.c
Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
Changelog | 4 ++--
audio/audio.c | 2 +-
block.h | 2 +-
bsd-user/x86_64/syscall.h | 2 +-
gdbstub.c | 2 +-
linux-user/x86_64/syscall.h | 2 +-
pc-bios/ohw.diff | 2 +-
pc-bios/optionrom/multiboot.S | 2 +-
posix-aio-compat.c | 4 ++--
qapi-schema-guest.json | 2 +-
qemu-options.hx | 2 +-
qerror.c | 2 +-
scripts/checkpatch.pl | 4 ++--
target-mips/helper.c | 2 +-
target-s390x/cpu.h | 8 ++++----
ui/vnc-enc-zywrle-template.c | 2 +-
ui/vnc-enc-zywrle.h | 2 +-
17 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/Changelog b/Changelog
index 28a69af..8b63258 100644
--- a/Changelog
+++ b/Changelog
@@ -78,7 +78,7 @@ version 0.10.2:
- fix savevm/loadvm (Anthony Liguori)
- live migration: fix dirty tracking windows (Glauber Costa)
- - live migration: improve error propogation (Glauber Costa)
+ - live migration: improve error propagation (Glauber Costa)
- qcow2: fix image creation for > ~2TB images (Chris Wright)
- hotplug: fix error handling for if= parameter (Eduardo Habkost)
- qcow2: fix data corruption (Nolan Leake)
@@ -386,7 +386,7 @@ version 0.5.3:
- support of CD-ROM change
- multiple network interface support
- initial x86-64 host support (Gwenole Beauchesne)
- - lret to outer priviledge fix (OS/2 install fix)
+ - lret to outer privilege fix (OS/2 install fix)
- task switch fixes (SkyOS boot)
- VM save/restore commands
- new timer API
diff --git a/audio/audio.c b/audio/audio.c
index 50d0d71..5fff6de 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -1665,7 +1665,7 @@ static void audio_pp_nb_voices (const char *typ, int nb)
printf ("Theoretically supports many %s voices\n", typ);
break;
default:
- printf ("Theoretically supports upto %d %s voices\n", nb, typ);
+ printf ("Theoretically supports up to %d %s voices\n", nb, typ);
break;
}
diff --git a/block.h b/block.h
index 1790f99..0e3ff9f 100644
--- a/block.h
+++ b/block.h
@@ -21,7 +21,7 @@ typedef struct QEMUSnapshotInfo {
char id_str[128]; /* unique snapshot id */
/* the following fields are informative. They are not needed for
the consistency of the snapshot */
- char name[256]; /* user choosen name */
+ char name[256]; /* user chosen name */
uint32_t vm_state_size; /* VM state info size */
uint32_t date_sec; /* UTC date of the snapshot */
uint32_t date_nsec;
diff --git a/bsd-user/x86_64/syscall.h b/bsd-user/x86_64/syscall.h
index 5f71b7c..630514a 100644
--- a/bsd-user/x86_64/syscall.h
+++ b/bsd-user/x86_64/syscall.h
@@ -8,7 +8,7 @@ struct target_pt_regs {
abi_ulong r12;
abi_ulong rbp;
abi_ulong rbx;
-/* arguments: non interrupts/non tracing syscalls only save upto here*/
+/* arguments: non interrupts/non tracing syscalls only save up to here */
abi_ulong r11;
abi_ulong r10;
abi_ulong r9;
diff --git a/gdbstub.c b/gdbstub.c
index 640cf4e..a5806ef 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -2678,7 +2678,7 @@ gdb_handlesig (CPUState *env, int sig)
}
else if (n == 0 || errno != EAGAIN)
{
- /* XXX: Connection closed. Should probably wait for annother
+ /* XXX: Connection closed. Should probably wait for another
connection before continuing. */
return sig;
}
diff --git a/linux-user/x86_64/syscall.h b/linux-user/x86_64/syscall.h
index 2a8d696..81314cf 100644
--- a/linux-user/x86_64/syscall.h
+++ b/linux-user/x86_64/syscall.h
@@ -8,7 +8,7 @@ struct target_pt_regs {
abi_ulong r12;
abi_ulong rbp;
abi_ulong rbx;
-/* arguments: non interrupts/non tracing syscalls only save upto here*/
+/* arguments: non interrupts/non tracing syscalls only save up to here */
abi_ulong r11;
abi_ulong r10;
abi_ulong r9;
diff --git a/pc-bios/ohw.diff b/pc-bios/ohw.diff
index 4fb5422..c6b6623 100644
--- a/pc-bios/ohw.diff
+++ b/pc-bios/ohw.diff
@@ -1065,7 +1065,7 @@ diff -wruN --exclude '*~' --exclude '*.o' --exclude '*.bin' --exclude '*.out' --
+ tab, 4 * sizeof(uint32_t));
+ }
+#if 0
- /* escc is usefull to get MacOS X debug messages */
+ /* escc is useful to get MacOS X debug messages */
{
OF_regprop_t regs[8];
@@ -2645,85 +2843,12 @@
diff --git a/pc-bios/optionrom/multiboot.S b/pc-bios/optionrom/multiboot.S
index cc5ca1b..f08222a 100644
--- a/pc-bios/optionrom/multiboot.S
+++ b/pc-bios/optionrom/multiboot.S
@@ -50,7 +50,7 @@ run_multiboot:
shr $0x4, %ecx
mov %cx, %gs
- /* now push the indirect jump decriptor there */
+ /* now push the indirect jump descriptor there */
mov (prot_jump), %ebx
add %eax, %ebx
movl %ebx, %gs:GS_PROT_JUMP
diff --git a/posix-aio-compat.c b/posix-aio-compat.c
index 0c0035c..c380ec1 100644
--- a/posix-aio-compat.c
+++ b/posix-aio-compat.c
@@ -128,8 +128,8 @@ static ssize_t handle_aiocb_ioctl(struct qemu_paiocb *aiocb)
return -errno;
/*
- * This looks weird, but the aio code only consideres a request
- * successful if it has written the number full number of bytes.
+ * This looks weird, but the aio code only considers a request
+ * successful if it has written the full number of bytes.
*
* Now we overload aio_nbytes as aio_ioctl_cmd for the ioctl command,
* so in fact we return the ioctl command here to make posix_aio_read()
diff --git a/qapi-schema-guest.json b/qapi-schema-guest.json
index fde5971..f4bcd1a 100644
--- a/qapi-schema-guest.json
+++ b/qapi-schema-guest.json
@@ -13,7 +13,7 @@
# partially-delivered JSON text in such a way that this response
# can be obtained.
#
-# Such clients should also preceed this command
+# Such clients should also precede this command
# with a 0xFF byte to make such the guest agent flushes any
# partially read JSON data from a previous session.
#
diff --git a/qemu-options.hx b/qemu-options.hx
index b3db10c..087a3b9 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -217,7 +217,7 @@ qcow2. If performance is more important than correctness,
In case you don't care about data integrity over host failures, use
cache=unsafe. This option tells qemu that it never needs to write any data
to the disk but can instead keeps things in cache. If anything goes wrong,
-like your host losing power, the disk storage getting disconnected accidently,
+like your host losing power, the disk storage getting disconnected accidentally,
etc. you're image will most probably be rendered unusable. When using
the @option{-snapshot} option, unsafe caching is always used.
diff --git a/qerror.c b/qerror.c
index 656efc2..d9ab396 100644
--- a/qerror.c
+++ b/qerror.c
@@ -253,7 +253,7 @@ static const QErrorStringTable qerror_table[] = {
},
{
.error_fmt = QERR_INVALID_PARAMETER_COMBINATION,
- .desc = "Invalid paramter combination",
+ .desc = "Invalid parameter combination",
},
{}
};
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index cce8f86..8850a5f 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -1907,7 +1907,7 @@ sub process {
my $ok = 0;
for (my $ln = $linenr - 1; $ln >= $first_line; $ln--) {
#print "CHECK<$lines[$ln - 1]\n";
- # we have a preceeding printk if it ends
+ # we have a preceding printk if it ends
# with "\n" ignore it, else it is to blame
if ($lines[$ln - 1] =~ m{\bprintk\(}) {
if ($rawlines[$ln - 1] !~ m{\\n"}) {
@@ -1999,7 +1999,7 @@ sub process {
for (my $n = 0; $n < $#elements; $n += 2) {
$off += length($elements[$n]);
- # Pick up the preceeding and succeeding characters.
+ # Pick up the preceding and succeeding characters.
my $ca = substr($opline, 0, $off);
my $cc = '';
if (length($opline) >= ($off + length($elements[$n + 1]))) {
diff --git a/target-mips/helper.c b/target-mips/helper.c
index 1c58e0c..7225616 100644
--- a/target-mips/helper.c
+++ b/target-mips/helper.c
@@ -497,7 +497,7 @@ void do_interrupt (CPUState *env)
}
} else {
/* For VEIC mode, the external interrupt controller feeds the
- vector throught the CP0Cause IP lines. */
+ vector through the CP0Cause IP lines. */
vector = pending;
}
offset = 0x200 + vector * spacing;
diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h
index 202c098..b8893b3 100644
--- a/target-s390x/cpu.h
+++ b/target-s390x/cpu.h
@@ -513,15 +513,15 @@ enum cc_op {
CC_OP_ADD_64, /* overflow on add (64bit) */
CC_OP_ADDU_64, /* overflow on unsigned add (64bit) */
- CC_OP_SUB_64, /* overflow on substraction (64bit) */
- CC_OP_SUBU_64, /* overflow on unsigned substraction (64bit) */
+ CC_OP_SUB_64, /* overflow on subtraction (64bit) */
+ CC_OP_SUBU_64, /* overflow on unsigned subtraction (64bit) */
CC_OP_ABS_64, /* sign eval on abs (64bit) */
CC_OP_NABS_64, /* sign eval on nabs (64bit) */
CC_OP_ADD_32, /* overflow on add (32bit) */
CC_OP_ADDU_32, /* overflow on unsigned add (32bit) */
- CC_OP_SUB_32, /* overflow on substraction (32bit) */
- CC_OP_SUBU_32, /* overflow on unsigned substraction (32bit) */
+ CC_OP_SUB_32, /* overflow on subtraction (32bit) */
+ CC_OP_SUBU_32, /* overflow on unsigned subtraction (32bit) */
CC_OP_ABS_32, /* sign eval on abs (64bit) */
CC_OP_NABS_32, /* sign eval on nabs (64bit) */
diff --git a/ui/vnc-enc-zywrle-template.c b/ui/vnc-enc-zywrle-template.c
index 4cde6e4..561f7bf 100644
--- a/ui/vnc-enc-zywrle-template.c
+++ b/ui/vnc-enc-zywrle-template.c
@@ -9,7 +9,7 @@
* *
* THE 'ZYWRLE' VNC CODEC SOURCE CODE IS (C) COPYRIGHT 2006 *
* BY Hitachi Systems & Services, Ltd. *
- * (Noriaki Yamazaki, Research & Developement Center) *
+ * (Noriaki Yamazaki, Research & Development Center) *
* *
* *
********************************************************************
diff --git a/ui/vnc-enc-zywrle.h b/ui/vnc-enc-zywrle.h
index ac5d27a..1ff40b1 100644
--- a/ui/vnc-enc-zywrle.h
+++ b/ui/vnc-enc-zywrle.h
@@ -8,7 +8,7 @@
* *
* THE 'ZYWRLE' VNC CODEC SOURCE CODE IS (C) COPYRIGHT 2006 *
* BY Hitachi Systems & Services, Ltd. *
- * (Noriaki Yamazaki, Research & Developement Center) *
+ * (Noriaki Yamazaki, Research & Development Center) *
* *
* *
********************************************************************
--
1.7.2.5
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [Qemu-devel] [Qemu-trivial] [PATCH 0/6] New fixes for some misspellings
2011-12-09 23:19 [Qemu-devel] [PATCH 0/6] New fixes for some misspellings Stefan Weil
` (5 preceding siblings ...)
2011-12-09 23:19 ` [Qemu-devel] [PATCH 6/6] Fix spelling in comments, documentation and messages Stefan Weil
@ 2011-12-14 11:11 ` Stefan Hajnoczi
6 siblings, 0 replies; 10+ messages in thread
From: Stefan Hajnoczi @ 2011-12-14 11:11 UTC (permalink / raw)
To: Stefan Weil; +Cc: qemu-trivial, qemu-devel
On Sat, Dec 10, 2011 at 12:19:40AM +0100, Stefan Weil wrote:
> This patch series tries to fix the most common misspellings
> using the tool 'codespell'.
>
> See http://wiki.qemu.org/Contribute/SpellCheck for more information
> on using codespell with QEMU.
>
> Regards,
> Stefan Weil
>
> [PATCH 1/6] Add spelling exceptions for codespell
> [PATCH 2/6] fmopl: Fix spelling in code and comments
> [PATCH 3/6] hw: Fix spelling (licenced->licensed)
> [PATCH 4/6] hw: Fix spelling in comments
> [PATCH 5/6] hw: Fix spelling in comments and code
> [PATCH 6/6] Fix spelling in comments, documentation and messages
Applied all except Patch 1 to the trivial-patches-next tree:
http://repo.or.cz/w/qemu/stefanha.git/shortlog/refs/heads/trivial-patches-next
There might be some more discussion around Patch 1. Please post it
separately and let Anthony merge it into qemu.git.
Stefan
^ permalink raw reply [flat|nested] 10+ messages in thread