From cb0e21a8ead8032c60997d478daa2caa50741e7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Wed, 10 Aug 2011 11:33:17 +0200 Subject: [PATCH] trivial: fix various typos --- apps/codecs/a52.c | 2 +- apps/codecs/lib/fft-ffmpeg_arm.h | 4 ++-- apps/codecs/lib/tlsf/Changelog | 2 +- apps/codecs/lib/tlsf/src/tlsf.c | 2 +- apps/codecs/liba52/downmix.c | 2 +- apps/codecs/libatrac/atrac3.c | 2 +- apps/codecs/libgme/ym2612_emu.c | 4 ++-- apps/codecs/libgme/ym2612_emu.h | 4 ++-- apps/codecs/libmusepack/mpcdec.h | 4 ++-- apps/codecs/libmusepack/synth_filter_arm.S | 8 ++++---- apps/codecs/libspeex/lsp.c | 2 +- apps/codecs/libtremor/config-tremor.h | 2 +- apps/codecs/libtremor/framing.c | 4 ++-- apps/codecs/libwmavoice/utils.c | 2 +- apps/codecs/mp3_enc.c | 2 +- apps/dsp.c | 2 +- apps/filetree.c | 2 +- apps/plugins/alpine_cdc.c | 2 +- apps/plugins/chessbox/gnuchess.c | 4 ++-- apps/plugins/doom/g_game.c | 2 +- apps/plugins/doom/hu_stuff.c | 2 +- apps/plugins/doom/i_video.c | 2 +- apps/plugins/doom/p_floor.c | 10 +++++----- apps/plugins/doom/p_sight.c | 2 +- apps/plugins/doom/s_sound.c | 2 +- apps/plugins/doom/v_video.c | 6 +++--- apps/plugins/frotz/quetzal.c | 4 ++-- apps/plugins/midi/synth.c | 2 +- apps/plugins/mp3_encoder.c | 4 ++-- apps/plugins/mpegplayer/mpeg_misc.h | 4 ++-- apps/plugins/mpegplayer/mpeg_parser.c | 6 +++--- apps/plugins/pacbox/z80.c | 4 ++-- apps/plugins/pdbox/PDa/src/g_io.c | 2 +- apps/plugins/plasma.c | 4 ++-- apps/plugins/rockboy/mem.c | 2 +- apps/plugins/theme_remove.c | 2 +- apps/plugins/vu_meter.c | 2 +- apps/plugins/wavplay.c | 2 +- apps/plugins/wavrecord.c | 2 +- apps/plugins/wormlet.c | 2 +- apps/recorder/pcm_record.c | 4 ++-- apps/screens.c | 2 +- apps/talk.c | 2 +- firmware/drivers/audio/wm8751.c | 2 +- firmware/drivers/rtc/rtc_rx5x348ab.c | 2 +- firmware/export/at91sam9260.h | 2 +- firmware/export/fmradio.h | 2 +- firmware/export/jz4740.h | 2 +- firmware/export/mas35xx.h | 2 +- firmware/export/mips-archdefs.h | 4 ++-- firmware/export/thread.h | 2 +- .../target/arm/as3525/sansa-fuzev2/button-fuzev2.c | 2 +- firmware/target/arm/ata-sd-pp.c | 2 +- firmware/target/arm/rk27xx/crt0.S | 2 +- firmware/target/arm/s3c2440/adc-s3c2440.c | 2 +- .../target/arm/s5l8700/ipodnano2g/ftl-nano2g.c | 4 ++-- firmware/target/arm/thread-pp.c | 2 +- firmware/target/hosted/android/lcd-android.c | 2 +- firmware/target/hosted/sdl/kernel-sdl.c | 2 +- firmware/target/hosted/thread-unix.c | 2 +- firmware/target/sh/memmove-sh.S | 2 +- firmware/thread.c | 6 +++--- rbutil/rbutilqt/base/rbsettings.h | 2 +- rbutil/rbutilqt/base/system.cpp | 2 +- rbutil/rbutilqt/base/systeminfo.h | 2 +- tools/ucl/src/ucl_swd.ch | 2 +- utils/jz4740_tools/jz4740.h | 2 +- utils/rk27utils/README | 2 +- utils/sbtools/elftosb.c | 2 +- .../libraries/getpot-c++-1.1.18/getpot/GetPot | 2 +- 70 files changed, 97 insertions(+), 97 deletions(-) diff --git a/apps/codecs/a52.c b/apps/codecs/a52.c index 4cd293e..959b28f 100644 --- a/apps/codecs/a52.c +++ b/apps/codecs/a52.c @@ -145,7 +145,7 @@ enum codec_status codec_run(void) ci->configure(DSP_SWITCH_FREQUENCY, ci->id3->frequency); codec_set_replaygain(ci->id3); - /* Intialise the A52 decoder and check for success */ + /* Initialise the A52 decoder and check for success */ state = a52_init(0); /* The main decoding loop */ diff --git a/apps/codecs/lib/fft-ffmpeg_arm.h b/apps/codecs/lib/fft-ffmpeg_arm.h index 073ad8e..f8216b4 100644 --- a/apps/codecs/lib/fft-ffmpeg_arm.h +++ b/apps/codecs/lib/fft-ffmpeg_arm.h @@ -371,7 +371,7 @@ static inline FFTComplex* fft4(FFTComplex * z) #define FFT_FFMPEG_INCL_OPTIMISED_FFT8 /* The chunk of asm below is equivalent to the following: - // first load in z[4].re thru z[7].im into local registers + // first load in z[4].re through z[7].im into local registers // ... BF_OPT2_REV(z[4].re, z[5].re, z[4].re, z[5].re); // x=a+b; y=x-(b<<1) BF_OPT2_REV(z[4].im, z[5].im, z[4].im, z[5].im); @@ -406,7 +406,7 @@ static inline void fft8(FFTComplex * z) register FFTSample temp; asm volatile( - /* read in z[4].re thru z[7].im */ + /* read in z[4].re through z[7].im */ "ldmia %[z4_ptr]!, {r1-r8}\n\t" /* (now points one word past &z[7].im) */ "add r1,r1,r3\n\t" diff --git a/apps/codecs/lib/tlsf/Changelog b/apps/codecs/lib/tlsf/Changelog index 0cdb34a..a09ac91 100644 --- a/apps/codecs/lib/tlsf/Changelog +++ b/apps/codecs/lib/tlsf/Changelog @@ -53,7 +53,7 @@ * Used ls_bit instead of ffs and ms_bit instead of fls. I did this to avoid confusion with the standard ffs function which returns different values. - * Created set_bit/clear_bit fuctions because they are not present + * Created set_bit/clear_bit functions because they are not present on x86_64. * Added locking support + extra file target.h to show how to use it. * Added get_used_size function diff --git a/apps/codecs/lib/tlsf/src/tlsf.c b/apps/codecs/lib/tlsf/src/tlsf.c index 87f8d26..47606dd 100644 --- a/apps/codecs/lib/tlsf/src/tlsf.c +++ b/apps/codecs/lib/tlsf/src/tlsf.c @@ -34,7 +34,7 @@ * - Used ls_bit instead of ffs and ms_bit instead of fls. I did this to * avoid confusion with the standard ffs function which returns * different values. - * - Created set_bit/clear_bit fuctions because they are not present + * - Created set_bit/clear_bit functions because they are not present * on x86_64. * - Added locking support + extra file target.h to show how to use it. * - Added get_used_size function (REMOVED in 2.4) diff --git a/apps/codecs/liba52/downmix.c b/apps/codecs/liba52/downmix.c index dd2867c..239267f 100644 --- a/apps/codecs/liba52/downmix.c +++ b/apps/codecs/liba52/downmix.c @@ -89,7 +89,7 @@ int a52_downmix_init (int input, int flags, level_t * level, case CONVERT (A52_3F2R, A52_2F1R): if (clev < LEVEL (LEVEL_PLUS3DB - 1)) goto level_3db; - /* break thru */ + /* break through */ case CONVERT (A52_3F, A52_STEREO): case CONVERT (A52_3F1R, A52_2F1R): case CONVERT (A52_3F1R, A52_2F2R): diff --git a/apps/codecs/libatrac/atrac3.c b/apps/codecs/libatrac/atrac3.c index bb52dd4..c4c8086 100644 --- a/apps/codecs/libatrac/atrac3.c +++ b/apps/codecs/libatrac/atrac3.c @@ -178,7 +178,7 @@ static int vlcs_initialized = 0; _win = win; asm volatile ( - "move.l (%[in])+, %%a5 \n\t" /* preload frist in value */ + "move.l (%[in])+, %%a5 \n\t" /* preload first in value */ MULTIPLY_ADD_BLOCK /* 0.. 7 */ MULTIPLY_ADD_BLOCK /* 8..15 */ MULTIPLY_ADD_BLOCK /* 16..23 */ diff --git a/apps/codecs/libgme/ym2612_emu.c b/apps/codecs/libgme/ym2612_emu.c index a2f32d3..6e32285 100644 --- a/apps/codecs/libgme/ym2612_emu.c +++ b/apps/codecs/libgme/ym2612_emu.c @@ -546,7 +546,7 @@ void impl_set_rate( struct Ym2612_Impl* impl, double sample_rate, double clock_r { #ifdef YM2612_CALCUL_TABLES double x = 1 + sin( 2.0 * PI * i * (1.0 / LFO_LENGHT) ); // Sinus - x *= 11.8 / ENV_STEP / 2; // ajusted to MAX enveloppe modulation + x *= 11.8 / ENV_STEP / 2; // adjusted to MAX enveloppe modulation impl->g.LFO_ENV_TAB [i] = (int) x; @@ -630,7 +630,7 @@ void impl_set_rate( struct Ym2612_Impl* impl, double sample_rate, double clock_r { double x = (1.0 + ((i & 3) * 0.25)) * // bits 0-1 : x1.00, x1.25, x1.50, x1.75 - (ENV_LENGHT << ENV_LBITS) * // on ajuste pour le tableau impl->g.ENV_TAB + (ENV_LENGHT << ENV_LBITS) * // on adjuste pour le tableau impl->g.ENV_TAB Frequence * (1 << (i >> 2)); // bits 2-5 : shift bits (x2^0 - x2^15) diff --git a/apps/codecs/libgme/ym2612_emu.h b/apps/codecs/libgme/ym2612_emu.h index 19f0903..c64790e 100644 --- a/apps/codecs/libgme/ym2612_emu.h +++ b/apps/codecs/libgme/ym2612_emu.h @@ -15,8 +15,8 @@ struct slot_t const int *DT; // parametre detune int MUL; // parametre "multiple de frequence" int TL; // Total Level = volume lorsque l'enveloppe est au plus haut - int TLL; // Total Level ajusted - int SLL; // Sustin Level (ajusted) = volume où l'enveloppe termine sa premiere phase de regression + int TLL; // Total Level adjusted + int SLL; // Sustin Level (adjusted) = volume où l'enveloppe termine sa premiere phase de regression int KSR_S; // Key Scale Rate Shift = facteur de prise en compte du KSL dans la variations de l'enveloppe int KSR; // Key Scale Rate = cette valeur est calculee par rapport à la frequence actuelle, elle va influer // sur les differents parametres de l'enveloppe comme l'attaque, le decay ... comme dans la realite ! diff --git a/apps/codecs/libmusepack/mpcdec.h b/apps/codecs/libmusepack/mpcdec.h index 85536e7..4658436 100644 --- a/apps/codecs/libmusepack/mpcdec.h +++ b/apps/codecs/libmusepack/mpcdec.h @@ -160,9 +160,9 @@ MPC_API void mpc_demux_exit(mpc_demux * d); */ /** * Calls mpc_decoder_scale_output to set the scaling factor according to the - * replay gain stream information and the supplied ouput level + * replay gain stream information and the supplied output level * @param d pointer to a musepack demuxer - * @param level the desired ouput level (in db). Must be MPC_OLD_GAIN_REF (64.82 db) if you want to get the old replaygain behavior + * @param level the desired output level (in db). Must be MPC_OLD_GAIN_REF (64.82 db) if you want to get the old replaygain behavior * @param use_gain set it to MPC_TRUE if you want to set the scaling factor according to the stream gain * @param use_title MPC_TRUE : uses the title gain, MPC_FALSE : uses the album gain * @param clip_prevention MPC_TRUE : uses cliping prevention diff --git a/apps/codecs/libmusepack/synth_filter_arm.S b/apps/codecs/libmusepack/synth_filter_arm.S index 9bd4e04..c7b0892 100644 --- a/apps/codecs/libmusepack/synth_filter_arm.S +++ b/apps/codecs/libmusepack/synth_filter_arm.S @@ -244,7 +244,7 @@ mpc_decoder_windowing_D: rsb r10, r10, #0 /* r10 = -r10 */ str r10, [r0, lr] /* store Data */ str r8, [r0], #4 /* store Data */ - /* correct adresses for next loop */ + /* correct addresses for next loop */ sub r12, r12, #4 /* r12 = V-- */ add r1, r1, #4 /* r1 = V++ */ /* next loop */ @@ -446,7 +446,7 @@ mpc_decoder_windowing_D: rsb r10, r10, #0 /* r10 = -r10 */ str r10, [r0, lr] /* store Data */ str r8, [r0], #4 /* store Data */ - /* correct adresses for next loop */ + /* correct addresses for next loop */ sub r12, r12, #4 /* r12 = V-- */ add r1, r1, #4 /* r1 = V++ */ /* next loop */ @@ -633,9 +633,9 @@ mpc_decoder_windowing_D: smmlar r11, r8, r5, r11 ldr r8, [r1, #992*4] /* 15 */ smmlar r9, r7, r5, r9 - sub r12, r12, #4 /* r12 = V-- correct adresses for next loop */ + sub r12, r12, #4 /* r12 = V-- correct addresses for next loop */ smmlar r9, r8, r6, r9 - add r1, r1, #4 /* r1 = V++ correct adresses for next loop */ + add r1, r1, #4 /* r1 = V++ correct addresses for next loop */ rsb r11, r11, #0 /* r11 = -r11 */ /* store Data[01..15] */ mov r9, r9, lsl #2 diff --git a/apps/codecs/libspeex/lsp.c b/apps/codecs/libspeex/lsp.c index 8408d78..59819f5 100644 --- a/apps/codecs/libspeex/lsp.c +++ b/apps/codecs/libspeex/lsp.c @@ -74,7 +74,7 @@ Heavily modified by Jean-Marc Valin (c) 2002-2006 (fixed-point, the name Line Spectrum Pairs (LSPs). To convert back to ak we just evaluate (1), "clocking" an impulse - thru it lpcrdr times gives us the impulse response of A(z) which is + through it lpcrdr times gives us the impulse response of A(z) which is {ak}. \*---------------------------------------------------------------------------*/ diff --git a/apps/codecs/libtremor/config-tremor.h b/apps/codecs/libtremor/config-tremor.h index eba0fe0..839a7fb 100644 --- a/apps/codecs/libtremor/config-tremor.h +++ b/apps/codecs/libtremor/config-tremor.h @@ -23,7 +23,7 @@ #define ICODE_ATTR_TREMOR_NOT_MDCT ICODE_ATTR #endif -/* Enable special handling of buffers in faster ram, not usefull when no +/* Enable special handling of buffers in faster ram, not useful when no such different ram is available. There are 3 different memory configurations * No special iram, uses double buffers to avoid copying data * Small special iram, copies buffers to run hottest processing in iram diff --git a/apps/codecs/libtremor/framing.c b/apps/codecs/libtremor/framing.c index a40e8de..1481ea8 100644 --- a/apps/codecs/libtremor/framing.c +++ b/apps/codecs/libtremor/framing.c @@ -398,9 +398,9 @@ static int ogg_stream_flush_i(ogg_stream_state *os,ogg_page *og, int force, int }else{ /* The extra packets_done, packet_just_done logic here attempts to do two things: - 1) Don't unneccessarily span pages. + 1) Don't unnecessarily span pages. 2) Unless necessary, don't flush pages if there are less than four packets on - them; this expands page size to reduce unneccessary overhead if incoming packets + them; this expands page size to reduce unnecessary overhead if incoming packets are large. These are not necessary behaviors, just 'always better than naive flushing' without requiring an application to explicitly request a specific optimized diff --git a/apps/codecs/libwmavoice/utils.c b/apps/codecs/libwmavoice/utils.c index ad098f4..abd2d4b 100644 --- a/apps/codecs/libwmavoice/utils.c +++ b/apps/codecs/libwmavoice/utils.c @@ -189,7 +189,7 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height, int l linesize_align[3] = STRIDE_ALIGN; //STRIDE_ALIGN is 8 for SSE* but this does not work for SVQ1 chroma planes //we could change STRIDE_ALIGN to 16 for x86/sse but it would increase the -//picture size unneccessarily in some cases. The solution here is not +//picture size unnecessarily in some cases. The solution here is not //pretty and better ideas are welcome! #if HAVE_MMX if(s->codec_id == CODEC_ID_SVQ1 || s->codec_id == CODEC_ID_VP5 || diff --git a/apps/codecs/mp3_enc.c b/apps/codecs/mp3_enc.c index 2f5528f..31643e8 100644 --- a/apps/codecs/mp3_enc.c +++ b/apps/codecs/mp3_enc.c @@ -2265,7 +2265,7 @@ STATICIRAM void encode_frame(char *buffer, struct enc_chunk_hdr *chunk) } /* Perform imdct of 18 previous + 18 current subband samples */ - /* for integer precision do this loop again (if neccessary) */ + /* for integer precision do this loop again (if necessary) */ shift = 14 - (cfg.cod_info[gr][ch].additStep >> 2); for(k=1,ii=0; ii<3 && k; ii++) { diff --git a/apps/dsp.c b/apps/dsp.c index 3cff191..a5201de 100644 --- a/apps/dsp.c +++ b/apps/dsp.c @@ -607,7 +607,7 @@ static void sample_output_dithered(int count, struct dsp_data *data, /** * sample_output_new_format() * - * set the from-native to ouput sample conversion routine + * set the from-native to output sample conversion routine * * !DSPPARAMSYNC * needs syncing with changes to the following dsp parameters: diff --git a/apps/filetree.c b/apps/filetree.c index a7c989f..1de4922 100644 --- a/apps/filetree.c +++ b/apps/filetree.c @@ -500,7 +500,7 @@ int ft_enter(struct tree_context* c) /* * Preset outside default folder, we can choose such only * if we are out of the radio screen, so the check for the - * radio status isn't neccessary + * radio status isn't necessary */ else { diff --git a/apps/plugins/alpine_cdc.c b/apps/plugins/alpine_cdc.c index bf8bfea..2c8f551 100644 --- a/apps/plugins/alpine_cdc.c +++ b/apps/plugins/alpine_cdc.c @@ -617,7 +617,7 @@ int mbus_receive(unsigned char* p_msg, unsigned bufsize, int timeout) } -/****************** MMI helper fuctions ******************/ +/****************** MMI helper functions ******************/ void print_scroll(char* string) diff --git a/apps/plugins/chessbox/gnuchess.c b/apps/plugins/chessbox/gnuchess.c index aaa67a4..d7bcd6d 100644 --- a/apps/plugins/chessbox/gnuchess.c +++ b/apps/plugins/chessbox/gnuchess.c @@ -1142,7 +1142,7 @@ static short i,alpha,beta,score,tempb,tempc,tempsf,tempst,xside,rpt; void OpeningBook() /* - Go thru each of the opening lines of play and check for a match with + Go through each of the opening lines of play and check for a match with the current game listing. If a match occurs, generate a random number. If this number is the largest generated so far then the next move in this line becomes the current "candidate". After all lines are @@ -1989,7 +1989,7 @@ register short i; void InitializeStats() /* - Scan thru the board seeing what's on each square. If a piece is found, + Scan through the board seeing what's on each square. If a piece is found, update the variables PieceCnt, PawnCnt, Pindex and PieceList. Also determine the material for each side and set the hashkey and hashbd variables to represent the current board position. Array diff --git a/apps/plugins/doom/g_game.c b/apps/plugins/doom/g_game.c index 99f8e63..e500304 100644 --- a/apps/plugins/doom/g_game.c +++ b/apps/plugins/doom/g_game.c @@ -1940,7 +1940,7 @@ void G_Compatibility(void) mbf_compatibility, /* comp_infcheat - FIXME */ boom_compatibility,/* comp_zerotags - allow zero tags in wads */ lxdoom_1_compatibility, /* comp_moveblock - enables keygrab and - * mancubi shots going thru walls */ + * mancubi shots going through walls */ prboom_2_compatibility, /* comp_respawn - objects which aren't on the map * at game start respawn at (0,0) */ boom_compatibility_compatibility, /* comp_sound - see s_sound.c */ diff --git a/apps/plugins/doom/hu_stuff.c b/apps/plugins/doom/hu_stuff.c index 639c963..032fda8 100644 --- a/apps/plugins/doom/hu_stuff.c +++ b/apps/plugins/doom/hu_stuff.c @@ -1062,7 +1062,7 @@ void HU_Drawer(void) int fragcount,m; char numbuf[32]; - // scan thru players + // scan through players for (k=0;kceilingheight)? dest : sector->ceilingheight; @@ -157,7 +157,7 @@ result_e T_MovePlane { case -1: // moving a ceiling down - // jff 02/04/98 keep ceiling from moving thru floors + // jff 02/04/98 keep ceiling from moving through floors // jff 2/22/98 weaken check to demo_compatibility destheight = (comp[comp_floors] || dest>sector->floorheight)? dest : sector->floorheight; @@ -263,7 +263,7 @@ void T_MoveFloor(floormove_t* floor) floor->sector->special = floor->newspecial; //jff add to fix bug in special transfers from changes floor->sector->oldspecial = floor->oldspecial; - //fall thru + //fall through case genFloorChg: floor->sector->floorpic = floor->texture; break; @@ -286,7 +286,7 @@ void T_MoveFloor(floormove_t* floor) floor->sector->special = floor->newspecial; //jff add to fix bug in special transfers from changes floor->sector->oldspecial = floor->oldspecial; - //fall thru + //fall through case genFloorChg: floor->sector->floorpic = floor->texture; break; diff --git a/apps/plugins/doom/p_sight.c b/apps/plugins/doom/p_sight.c index 737fcf6..fc1f04f 100644 --- a/apps/plugins/doom/p_sight.c +++ b/apps/plugins/doom/p_sight.c @@ -109,7 +109,7 @@ static boolean P_CrossSubsector(int num) if(!line) // figgi -- skip minisegs continue; - // allready checked other side? + // already checked other side? if (line->validcount == validcount) continue; diff --git a/apps/plugins/doom/s_sound.c b/apps/plugins/doom/s_sound.c index 4b863b5..5ccb899 100644 --- a/apps/plugins/doom/s_sound.c +++ b/apps/plugins/doom/s_sound.c @@ -439,7 +439,7 @@ void S_ChangeMusic(int musicnum, int looping) // shutdown old music S_StopMusic(); - // get lumpnum if neccessary + // get lumpnum if necessary if (!music->lumpnum) { char namebuf[9]; diff --git a/apps/plugins/doom/v_video.c b/apps/plugins/doom/v_video.c index 8c47561..5f97995 100644 --- a/apps/plugins/doom/v_video.c +++ b/apps/plugins/doom/v_video.c @@ -145,7 +145,7 @@ int usegamma; * * Used for translating text colors from the red palette range * to other colors. The first nine entries can be used to dynamically - * switch the output of text color thru the HUlib_drawText routine + * switch the output of text color through the HUlib_drawText routine * by embedding ESCn in the text to obtain color n. Symbols for n are * provided in v_video.h. * @@ -315,7 +315,7 @@ void V_DrawBlock(int x, int y, int scrn, int width, int height, /* * V_DrawBackground tiles a 64x64 patch over the entire screen, providing the - * background for the Help and Setup screens, and plot text betwen levels. + * background for the Help and Setup screens, and plot text between levels. * cphipps - used to have M_DrawBackground, but that was used the framebuffer * directly, so this is my code from the equivalent function in f_finale.c */ @@ -555,7 +555,7 @@ void V_DrawMemPatch(int x, int y, int scrn, const patch_t *patch, count = (count>SCREENHEIGHT)?SCREENHEIGHT:count; // Bounds checking allows those messed up // GP32 mods to work (they're using patch-> // height values of 240, this code cuts off - // thier bottom few pixels + // their bottom few pixels if (flags & VPT_TRANS) while (count--) { diff --git a/apps/plugins/frotz/quetzal.c b/apps/plugins/frotz/quetzal.c index a75ade8..29c7ada 100644 --- a/apps/plugins/frotz/quetzal.c +++ b/apps/plugins/frotz/quetzal.c @@ -349,7 +349,7 @@ zword restore_quetzal (int svf, int stf) progress |= GOT_MEMORY; /* Only if succeeded. */ break; } - /* Fall right thru (to default) if already GOT_MEMORY */ + /* Fall right through (to default) if already GOT_MEMORY */ /* `UMem' uncompressed memory chunk; load it. */ case ID_UMem: if (!(progress & GOT_MEMORY)) /* Don't complain if two. */ @@ -367,7 +367,7 @@ zword restore_quetzal (int svf, int stf) print_string ("`UMem' chunk wrong size!\n"); /* Fall into default action (skip chunk) on errors. */ } - /* Fall thru (to default) if already GOT_MEMORY */ + /* Fall through (to default) if already GOT_MEMORY */ /* Unrecognised chunk type; skip it. */ default: (void) fseek (svf, currlen, SEEK_CUR); /* Skip chunk. */ diff --git a/apps/plugins/midi/synth.c b/apps/plugins/midi/synth.c index 0ad7bb5..5b3fda0 100644 --- a/apps/plugins/midi/synth.c +++ b/apps/plugins/midi/synth.c @@ -443,7 +443,7 @@ static inline void synthVoice(struct SynthObject * so, int32_t * out, unsigned i } /* buffer to hold all the samples for the current tick, this is a hack - neccesary for coldfire targets as pcm_play_data uses the dma which cannot + necessary for coldfire targets as pcm_play_data uses the dma which cannot access iram */ int32_t samp_buf[512] IBSS_ATTR; diff --git a/apps/plugins/mp3_encoder.c b/apps/plugins/mp3_encoder.c index 11d001c..dc70fae 100644 --- a/apps/plugins/mp3_encoder.c +++ b/apps/plugins/mp3_encoder.c @@ -2198,7 +2198,7 @@ void compress(void) if(read_samples((mfbuf + 2*512), cfg.smpl_per_frm) == 0) break; - /* swap bytes if neccessary */ + /* swap bytes if necessary */ if(cfg.byte_order == order_bigEndian) for(i=0; i> 2); for(k=1,ii=0; ii<3 && k; ii++) { diff --git a/apps/plugins/mpegplayer/mpeg_misc.h b/apps/plugins/mpegplayer/mpeg_misc.h index 6996f27..f41f327 100644 --- a/apps/plugins/mpegplayer/mpeg_misc.h +++ b/apps/plugins/mpegplayer/mpeg_misc.h @@ -48,8 +48,8 @@ enum state_enum /* Macros for comparing memory bytes to a series of constant bytes in an efficient manner - evaluate to true if corresponding bytes match */ #if defined (CPU_ARM) -/* ARM must load 32-bit values at addres % 4 == 0 offsets but this data - isn't aligned nescessarily, so just byte compare */ +/* ARM must load 32-bit values at address % 4 == 0 offsets but this data + isn't aligned necessarily, so just byte compare */ #define CMP_3_CONST(_a, _b) \ ({ int _x; \ asm volatile ( \ diff --git a/apps/plugins/mpegplayer/mpeg_parser.c b/apps/plugins/mpegplayer/mpeg_parser.c index cc57b0c..06dd6ae 100644 --- a/apps/plugins/mpegplayer/mpeg_parser.c +++ b/apps/plugins/mpegplayer/mpeg_parser.c @@ -592,7 +592,7 @@ static void prepare_audio(uint32_t time) /* This function demuxes the streams and gives the next stream data * pointer. * - * STREAM_PM_STREAMING is for operation during playback. If the nescessary + * STREAM_PM_STREAMING is for operation during playback. If the necessary * data and worst-case lookahead margin is not available, the stream is * registered for notification when the data becomes available. If parsing * extends beyond the end of the file or the end of stream marker is reached, @@ -1027,7 +1027,7 @@ try_again: if (result != STREAM_PERFECT_MATCH) { - /* Two tries should be all that is nescessary to find the exact frame + /* Two tries should be all that is necessary to find the exact frame * if the first GOP actually started later than the timestamp - the * GOP just prior must then start on or earlier. */ if (++tries <= 2) @@ -1117,7 +1117,7 @@ int parser_init_stream(void) if (str_parser.format == STREAM_FMT_MPEG_PS) { - /* Initalize start_pts and end_pts with the length (in 45kHz units) of + /* Initialize start_pts and end_pts with the length (in 45kHz units) of * the movie. INVALID_TIMESTAMP if the time could not be determined */ if (!init_times(&video_str) || !check_times(&video_str)) { diff --git a/apps/plugins/pacbox/z80.c b/apps/plugins/pacbox/z80.c index 575771c..60fcbb8 100644 --- a/apps/plugins/pacbox/z80.c +++ b/apps/plugins/pacbox/z80.c @@ -229,7 +229,7 @@ static inline void retFromSub(void) } /* - Rotates left one byte thru the carry flag. + Rotates left one byte through the carry flag. */ static inline unsigned char rotateLeft( unsigned char op ) { @@ -258,7 +258,7 @@ static inline unsigned char rotateLeftCarry( unsigned char op ) } /* - Rotates right one byte thru the carry flag. + Rotates right one byte through the carry flag. */ static inline unsigned char rotateRight( unsigned char op ) { diff --git a/apps/plugins/pdbox/PDa/src/g_io.c b/apps/plugins/pdbox/PDa/src/g_io.c index dd850a9..d189738 100644 --- a/apps/plugins/pdbox/PDa/src/g_io.c +++ b/apps/plugins/pdbox/PDa/src/g_io.c @@ -512,7 +512,7 @@ void voutlet_dspepilog(t_voutlet *x, t_signal **parentsigs, int myvecsize, int phase, int period, int frequency, int downsample, int upsample /* IOhannes */, int reblock, int switched) { - if (!x->x_buf) return; /* this shouldn't be necesssary... */ + if (!x->x_buf) return; /* this shouldn't be necessary... */ x->x_updown.downsample=downsample; x->x_updown.upsample=upsample; /* IOhannes */ if (reblock) { diff --git a/apps/plugins/plasma.c b/apps/plugins/plasma.c index e824593..eb6eced 100644 --- a/apps/plugins/plasma.c +++ b/apps/plugins/plasma.c @@ -12,7 +12,7 @@ * My crack at making a 80's style retro plasma effect for the fantastic * rockbox! * Okay, I could've hard-coded the sine wave values, I just wanted the -* challange of calculating them! silly: maybe, fun: yes! +* challenge of calculating them! silly: maybe, fun: yes! * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -171,7 +171,7 @@ int main(void) unsigned char *ptr; #endif - /*Generate the neccesary pre calced stuff*/ + /*Generate the necessary pre calced stuff*/ wave_table_generate(); #ifndef HAVE_LCD_COLOR diff --git a/apps/plugins/rockboy/mem.c b/apps/plugins/rockboy/mem.c index e00dadf..7c9cb84 100644 --- a/apps/plugins/rockboy/mem.c +++ b/apps/plugins/rockboy/mem.c @@ -355,7 +355,7 @@ static void mbc_write(int a, byte b) b &= 0x7; break; } - /* fall thru */ + /* fall through */ case MBC_MBC5: switch (ha & 0xF) { diff --git a/apps/plugins/theme_remove.c b/apps/plugins/theme_remove.c index 674342a..09a1b8a 100644 --- a/apps/plugins/theme_remove.c +++ b/apps/plugins/theme_remove.c @@ -553,7 +553,7 @@ static int remove_theme(void) if(needs_to_check_whether_used) check_whether_used(); - /* now remove file assosiated to the theme. */ + /* now remove file associated to the theme. */ for (i=0; i 0;) { struct enc_chunk_hdr *chunk; diff --git a/apps/screens.c b/apps/screens.c index e20f967..959502f 100644 --- a/apps/screens.c +++ b/apps/screens.c @@ -375,7 +375,7 @@ bool set_time_screen(const char* title, struct tm *tm) static unsigned char daysinmonth[] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; - /* for easy acess in the drawing loop */ + /* for easy access in the drawing loop */ for (i = 0; i < 6; i++) ptr[i] = buffer + offsets_ptr[i]; ptr[IDX_MONTH] = str(LANG_MONTH_JANUARY + tm->tm_mon); /* month name */ diff --git a/apps/talk.c b/apps/talk.c index 8c0f1f3..0ebb9bc 100644 --- a/apps/talk.c +++ b/apps/talk.c @@ -477,7 +477,7 @@ void talk_force_shutup(void) if (pos >= queue[queue_read].buf && pos <= end) /* really our clip? */ - { /* (for strange reasons this isn't nesessarily the case) */ + { /* (for strange reasons this isn't necessarily the case) */ /* find the next frame boundary */ while (search < end) /* search the remaining data */ { diff --git a/firmware/drivers/audio/wm8751.c b/firmware/drivers/audio/wm8751.c index c37341e..04351a1 100644 --- a/firmware/drivers/audio/wm8751.c +++ b/firmware/drivers/audio/wm8751.c @@ -220,7 +220,7 @@ static void audiohw_mute(bool mute) void audiohw_preinit(void) { #ifdef MROBE_100 - /* controls headphone ouput */ + /* controls headphone output */ GPIOL_ENABLE |= 0x10; GPIOL_OUTPUT_EN |= 0x10; GPIOL_OUTPUT_VAL |= 0x10; /* disable */ diff --git a/firmware/drivers/rtc/rtc_rx5x348ab.c b/firmware/drivers/rtc/rtc_rx5x348ab.c index f31ab56..5b2af63 100644 --- a/firmware/drivers/rtc/rtc_rx5x348ab.c +++ b/firmware/drivers/rtc/rtc_rx5x348ab.c @@ -71,7 +71,7 @@ int rtc_write_datetime(const struct tm *tm) buf[6] = tm->tm_mon + 1; buf[7] = tm->tm_year - 100; - /* don't encode the comand byte */ + /* don't encode the command byte */ for (i = 1; i < sizeof(buf); i++) buf[i] = DEC2BCD(buf[i]); diff --git a/firmware/export/at91sam9260.h b/firmware/export/at91sam9260.h index 87826d4..cef3833 100644 --- a/firmware/export/at91sam9260.h +++ b/firmware/export/at91sam9260.h @@ -164,7 +164,7 @@ Divider output is PLL clock output divided by 2 */ #define AT91C_CKGR_USBDIV_2 (0x2 << 28) /* (CKGR) Divider output is PLL clock output divided by 4 */ -/* SOFTWARE API DEFINITION FOR Power Management Controler */ +/* SOFTWARE API DEFINITION FOR Power Management Controller */ /* -------- PMC_SCER : (PMC Offset: 0x0) System Clock Enable Register ----- */ #define AT91C_PMC_PCK (0x1 << 0) /* (PMC) Processor Clock */ #define AT91C_PMC_UHP (0x1 << 6) /* (PMC) USB Host Port Clock */ diff --git a/firmware/export/fmradio.h b/firmware/export/fmradio.h index 1c364c2..6f7b2d0 100644 --- a/firmware/export/fmradio.h +++ b/firmware/export/fmradio.h @@ -23,7 +23,7 @@ #define FMRADIO_H /** declare some stuff here so powermgmt.c can properly tell if the radio is - actually playing and not just paused. This break in heirarchy is allowed + actually playing and not just paused. This break in hierarchy is allowed for audio_status(). **/ /* set when radio is playing or paused within fm radio screen */ diff --git a/firmware/export/jz4740.h b/firmware/export/jz4740.h index 820b43f..d70e109 100644 --- a/firmware/export/jz4740.h +++ b/firmware/export/jz4740.h @@ -975,7 +975,7 @@ * Define macros for UART_MCR * UART Modem Control Register */ -#define UART_MCR_DTR (1 << 0) /* 0: DTR_ ouput high */ +#define UART_MCR_DTR (1 << 0) /* 0: DTR_ output high */ #define UART_MCR_RTS (1 << 1) /* 0: RTS_ output high */ #define UART_MCR_OUT1 (1 << 2) /* 0: UART_MSR.RI is set to 0 and RI_ input high */ #define UART_MCR_OUT2 (1 << 3) /* 0: UART_MSR.DCD is set to 0 and DCD_ input high */ diff --git a/firmware/export/mas35xx.h b/firmware/export/mas35xx.h index f75658f..5ce57f3 100644 --- a/firmware/export/mas35xx.h +++ b/firmware/export/mas35xx.h @@ -61,7 +61,7 @@ #define MAS_CMD_READ_D0_MEM 0xe0 #define MAS_CMD_READ_D1_MEM 0xf0 -/* MAS3507D D0 memmory cells */ +/* MAS3507D D0 memory cells */ #define MAS_D0_MPEG_FRAME_COUNT 0x300 #define MAS_D0_MPEG_STATUS_1 0x301 #define MAS_D0_MPEG_STATUS_2 0x302 diff --git a/firmware/export/mips-archdefs.h b/firmware/export/mips-archdefs.h index 5b13a81..cce25a7 100644 --- a/firmware/export/mips-archdefs.h +++ b/firmware/export/mips-archdefs.h @@ -772,8 +772,8 @@ * Cache attribute values in the C field of EntryLo and the * K0 field of Config */ -#define K_CacheAttrCWTnWA 0 /* Cacheable, write-thru, no write allocate */ -#define K_CacheAttrCWTWA 1 /* Cacheable, write-thru, write allocate */ +#define K_CacheAttrCWTnWA 0 /* Cacheable, write-through, no write allocate */ +#define K_CacheAttrCWTWA 1 /* Cacheable, write-through, write allocate */ #define K_CacheAttrU 2 /* Uncached */ #define K_CacheAttrC 3 /* Cacheable */ #define K_CacheAttrCN 3 /* Cacheable, non-coherent */ diff --git a/firmware/export/thread.h b/firmware/export/thread.h index d0f61f9..93fefc2 100644 --- a/firmware/export/thread.h +++ b/firmware/export/thread.h @@ -111,7 +111,7 @@ struct regs #elif CONFIG_CPU == SH7034 struct regs { - uint32_t r[7]; /* 0-24 - Registers r8 thru r14 */ + uint32_t r[7]; /* 0-24 - Registers r8 through r14 */ uint32_t sp; /* 28 - Stack pointer (r15) */ uint32_t pr; /* 32 - Procedure register */ uint32_t start; /* 36 - Thread start address, or NULL when started */ diff --git a/firmware/target/arm/as3525/sansa-fuzev2/button-fuzev2.c b/firmware/target/arm/as3525/sansa-fuzev2/button-fuzev2.c index 7f82b69..ee51c29 100644 --- a/firmware/target/arm/as3525/sansa-fuzev2/button-fuzev2.c +++ b/firmware/target/arm/as3525/sansa-fuzev2/button-fuzev2.c @@ -37,7 +37,7 @@ static bool hold_button = false; #define WHEEL_REPEAT_INTERVAL (300*TIMER_MS) /* 300ms */ #define WHEEL_FAST_ON_INTERVAL ( 20*TIMER_MS) /* 20ms */ #define WHEEL_FAST_OFF_INTERVAL ( 60*TIMER_MS) /* 60ms */ -/* phsyical clicks per rotation * wheel value changes per phys click */ +/* physical clicks per rotation * wheel value changes per phys click */ #define WHEEL_CHANGES_PER_CLICK 4 #define WHEELCLICKS_PER_ROTATION (12*WHEEL_CHANGES_PER_CLICK) diff --git a/firmware/target/arm/ata-sd-pp.c b/firmware/target/arm/ata-sd-pp.c index f83bb60..e92b401 100644 --- a/firmware/target/arm/ata-sd-pp.c +++ b/firmware/target/arm/ata-sd-pp.c @@ -837,7 +837,7 @@ card_init_error: currcard->initialized = ret; } -/* lock must already be aquired */ +/* lock must already be acquired */ static void sd_select_device(int card_no) { currcard = &card_info[card_no]; diff --git a/firmware/target/arm/rk27xx/crt0.S b/firmware/target/arm/rk27xx/crt0.S index 032c637..7b4229c 100644 --- a/firmware/target/arm/rk27xx/crt0.S +++ b/firmware/target/arm/rk27xx/crt0.S @@ -77,7 +77,7 @@ newstart2: #if 0 /* setup caches */ - ldr r0, =0xefff0000 /* cache controler base address */ + ldr r0, =0xefff0000 /* cache controller base address */ ldrh r1, [r0] strh r1, [r0] /* global cache disable */ diff --git a/firmware/target/arm/s3c2440/adc-s3c2440.c b/firmware/target/arm/s3c2440/adc-s3c2440.c index 2e0cf8a..efa1d41 100644 --- a/firmware/target/arm/s3c2440/adc-s3c2440.c +++ b/firmware/target/arm/s3c2440/adc-s3c2440.c @@ -137,7 +137,7 @@ static void adc_tick(void) channel = 0; } #ifdef MINI2440 - /* interleave a touchscreen read if neccessary */ + /* interleave a touchscreen read if necessary */ touchscreen_scan_device(); #endif /* setup the next conversion and start it*/ diff --git a/firmware/target/arm/s5l8700/ipodnano2g/ftl-nano2g.c b/firmware/target/arm/s5l8700/ipodnano2g/ftl-nano2g.c index 976b648..5d1650f 100644 --- a/firmware/target/arm/s5l8700/ipodnano2g/ftl-nano2g.c +++ b/firmware/target/arm/s5l8700/ipodnano2g/ftl-nano2g.c @@ -1502,7 +1502,7 @@ static uint32_t ftl_save_erasectr_page(uint32_t index) #ifndef FTL_READONLY /* Increments ftl_cxt.ftlctrlpage to the next available FTL context page, - allocating a new context block if neccessary. */ + allocating a new context block if necessary. */ static uint32_t ftl_next_ctrl_pool_page(void) { uint32_t i; @@ -1794,7 +1794,7 @@ static void ftl_init_log_entry(struct ftl_log_type* entry) #ifndef FTL_READONLY /* Allocates a log entry for the specified vBlock, - first making space, if neccessary. */ + first making space, if necessary. */ static struct ftl_log_type* ftl_allocate_log_entry(uint32_t block) { uint32_t i; diff --git a/firmware/target/arm/thread-pp.c b/firmware/target/arm/thread-pp.c index 3eb7238..01b7cb1 100644 --- a/firmware/target/arm/thread-pp.c +++ b/firmware/target/arm/thread-pp.c @@ -90,7 +90,7 @@ void __attribute__((naked)) corelock_lock(struct corelock *cl) } /*--------------------------------------------------------------------------- - * Try to aquire the corelock. If free, caller gets it, otherwise return 0. + * Try to acquire the corelock. If free, caller gets it, otherwise return 0. *--------------------------------------------------------------------------- */ int __attribute__((naked)) corelock_try_lock(struct corelock *cl) diff --git a/firmware/target/hosted/android/lcd-android.c b/firmware/target/hosted/android/lcd-android.c index abde721..6950d26 100644 --- a/firmware/target/hosted/android/lcd-android.c +++ b/firmware/target/hosted/android/lcd-android.c @@ -41,7 +41,7 @@ static int scroll_threshold; static bool display_on; /* this might actually be called before lcd_init_device() or even main(), so - * be sure to only access static storage initalized at library loading, + * be sure to only access static storage initialized at library loading, * and not more */ void connect_with_java(JNIEnv* env, jobject fb_instance) { diff --git a/firmware/target/hosted/sdl/kernel-sdl.c b/firmware/target/hosted/sdl/kernel-sdl.c index 5c16f86..473e4ff 100644 --- a/firmware/target/hosted/sdl/kernel-sdl.c +++ b/firmware/target/hosted/sdl/kernel-sdl.c @@ -54,7 +54,7 @@ static int handlers_pending = 0; * while in a handler */ static int status_reg = 0; -/* Nescessary logic: +/* Necessary logic: * 1) All threads must pass unblocked * 2) Current handler must always pass unblocked * 3) Threads must be excluded when irq routine is running diff --git a/firmware/target/hosted/thread-unix.c b/firmware/target/hosted/thread-unix.c index 79310e0..cf48b5b 100644 --- a/firmware/target/hosted/thread-unix.c +++ b/firmware/target/hosted/thread-unix.c @@ -178,7 +178,7 @@ static int make_context(struct ctx *ctx, void (*f)(void), char *sp, size_t stack /* * Now enter the trampoline again, but this time not as a signal * handler. Instead we jump into it directly. The functionally - * redundant ping-pong pointer arithmentic is neccessary to avoid + * redundant ping-pong pointer arithmentic is necessary to avoid * type-conversion warnings related to the `volatile' qualifier and * the fact that `jmp_buf' usually is an array type. */ diff --git a/firmware/target/sh/memmove-sh.S b/firmware/target/sh/memmove-sh.S index d5a7160..2f9488c 100644 --- a/firmware/target/sh/memmove-sh.S +++ b/firmware/target/sh/memmove-sh.S @@ -89,7 +89,7 @@ _memmove: mova .jmptab_r,r0 mov.b @(r0,r1),r1 /* select appropriate main loop.. */ add r0,r1 - mov r5,r3 /* copy start adress to r3 */ + mov r5,r3 /* copy start address to r3 */ jmp @r1 /* ..and jump to it */ add #7,r3 /* adjust end addr for main loops doing 2 longs/pass */ diff --git a/firmware/thread.c b/firmware/thread.c index cfedbbe..3051d2e 100644 --- a/firmware/thread.c +++ b/firmware/thread.c @@ -45,7 +45,7 @@ /** * General locking order to guarantee progress. Order must be observed but - * all stages are not nescessarily obligatory. Going from 1) to 3) is + * all stages are not necessarily obligatory. Going from 1) to 3) is * perfectly legal. * * 1) IRQ @@ -58,7 +58,7 @@ * that will never happen. There is no danger if the interrupt occurs on * a different processor because the one that has the lock will eventually * unlock and the other processor's handler may proceed at that time. Not - * nescessary when the resource in question is definitely not available to + * necessary when the resource in question is definitely not available to * interrupt handlers. * * 2) Kernel Object @@ -1506,7 +1506,7 @@ static struct thread_entry * find_empty_thread_slot(void) } IF_COP( restore_irq(oldlevel); ) /* Reenable interrups - this slot is - not accesible to them yet */ + not accessible to them yet */ return thread; } diff --git a/rbutil/rbutilqt/base/rbsettings.h b/rbutil/rbutilqt/base/rbsettings.h index 277b219..95ec633 100644 --- a/rbutil/rbutilqt/base/rbsettings.h +++ b/rbutil/rbutilqt/base/rbsettings.h @@ -78,7 +78,7 @@ class RbSettings : public QObject private: //! you shouldnt call this, its a fully static calls RbSettings() {} - //! create the setting objects if neccessary + //! create the setting objects if necessary static void ensureRbSettingsExists(); //! create a settings path, substitute platform, tts and encoder static QString constructSettingPath(QString path, QString substitute = QString()); diff --git a/rbutil/rbutilqt/base/system.cpp b/rbutil/rbutilqt/base/system.cpp index c7c28b3..e318c94 100644 --- a/rbutil/rbutilqt/base/system.cpp +++ b/rbutil/rbutilqt/base/system.cpp @@ -414,7 +414,7 @@ QMap System::listUsbDevices(void) DWORD i; // Iterate over all devices - // by doing it this way it's unneccessary to use GUIDs which might be not + // by doing it this way it's unnecessary to use GUIDs which might be not // present in current MinGW. It also seemed to be more reliably than using // a GUID. // See KB259695 for an example. diff --git a/rbutil/rbutilqt/base/systeminfo.h b/rbutil/rbutilqt/base/systeminfo.h index f5e0eae..ad0d1a3 100644 --- a/rbutil/rbutilqt/base/systeminfo.h +++ b/rbutil/rbutilqt/base/systeminfo.h @@ -90,7 +90,7 @@ class SystemInfo : public QObject private: //! you shouldnt call this, its a fully static calls SystemInfo() {} - //! create the setting objects if neccessary + //! create the setting objects if necessary static void ensureSystemInfoExists(); //! pointers to our setting objects static QSettings *systemInfos; diff --git a/tools/ucl/src/ucl_swd.ch b/tools/ucl/src/ucl_swd.ch index e40b4a4..d0beb6e 100644 --- a/tools/ucl/src/ucl_swd.ch +++ b/tools/ucl/src/ucl_swd.ch @@ -159,7 +159,7 @@ ucl_swd_t; /* Access macro for head3. - * head3[key] may be uninitialized if the list is emtpy, + * head3[key] may be uninitialized if the list is empty, * but then its value will never be used. */ #if defined(__UCL_CHECKER) diff --git a/utils/jz4740_tools/jz4740.h b/utils/jz4740_tools/jz4740.h index 87b400e..edffe4e 100644 --- a/utils/jz4740_tools/jz4740.h +++ b/utils/jz4740_tools/jz4740.h @@ -930,7 +930,7 @@ * Define macros for UART_MCR * UART Modem Control Register */ -#define UART_MCR_DTR (1 << 0) /* 0: DTR_ ouput high */ +#define UART_MCR_DTR (1 << 0) /* 0: DTR_ output high */ #define UART_MCR_RTS (1 << 1) /* 0: RTS_ output high */ #define UART_MCR_OUT1 (1 << 2) /* 0: UART_MSR.RI is set to 0 and RI_ input high */ #define UART_MCR_OUT2 (1 << 3) /* 0: UART_MSR.DCD is set to 0 and DCD_ input high */ diff --git a/utils/rk27utils/README b/utils/rk27utils/README index a43d69a..386e686 100644 --- a/utils/rk27utils/README +++ b/utils/rk27utils/README @@ -22,7 +22,7 @@ is 8MB actually). The entry point of usercode is 0x60000000. You need libusb 1.0 + header files in order to compile this utility. You need working arm-eabi crosscompiler in order to compile stage1/stage2 -bootloader binaries (but You should have one already if You tinker whith this) +bootloader binaries (but You should have one already if You tinker with this) rkboottool diff --git a/utils/sbtools/elftosb.c b/utils/sbtools/elftosb.c index 78d2e80..434858e 100644 --- a/utils/sbtools/elftosb.c +++ b/utils/sbtools/elftosb.c @@ -1285,7 +1285,7 @@ int main(int argc, const char **argv) if(argc != 4) { printf("Usage: %s \n",*argv); - printf("To enable debug mode, set environement variable SB_DEBUG to YES\n"); + printf("To enable debug mode, set environment variable SB_DEBUG to YES\n"); return 1; } diff --git a/utils/zenutils/libraries/getpot-c++-1.1.18/getpot/GetPot b/utils/zenutils/libraries/getpot-c++-1.1.18/getpot/GetPot index 4c305f6..c71fbdb 100644 --- a/utils/zenutils/libraries/getpot-c++-1.1.18/getpot/GetPot +++ b/utils/zenutils/libraries/getpot-c++-1.1.18/getpot/GetPot @@ -1616,7 +1616,7 @@ GetPot::__find_variable(const char* VarName) const } /////////////////////////////////////////////////////////////////////////////// -// (*) ouput (basically for debugging reasons +// (*) output (basically for debugging reasons //............................................................................. // inline int -- 1.7.5.4