Code Police raid. Mostly changed // comments and indented to Rockbox style.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8894 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Daniel Stenberg 2006-03-03 08:14:44 +00:00
parent e248eac20f
commit 220fafdd72
15 changed files with 1052 additions and 1006 deletions

View file

@ -404,4 +404,4 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
return ret;
}
#endif // #ifdef HAVE_LCD_BITMAP
#endif /* #ifdef HAVE_LCD_BITMAP */

View file

@ -362,13 +362,13 @@ tCheckResult CheckFirmwareFile(char* filename, int chipsize, bool is_romless)
}
if (fileleft == 256*1024)
{ // original dumped firmware file has no CRC nor platform ID
{ /* original dumped firmware file has no CRC nor platform ID */
has_crc = false;
}
else
{
has_crc = true;
fileleft -= sizeof(unsigned); // exclude the last 4 bytes
fileleft -= sizeof(unsigned); /* exclude the last 4 bytes */
}
/* do some sanity checks */

View file

@ -328,11 +328,11 @@ int main(void)
enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
{
rb = api; // copy to global api pointer
rb = api; /* copy to global api pointer */
(void)parameter;
return main();
}
#endif // #ifdef HAVE_LCD_BITMAP
#endif /* #ifdef HAVE_LCD_BITMAP */

View file

@ -1235,7 +1235,7 @@ void build_lut(struct jpeg* p_jpeg)
}
else
{
// error
/* error */
}
}
@ -1429,7 +1429,7 @@ int jpeg_decode(struct jpeg* p_jpeg, unsigned char* p_pixel[3],
int k_need; /* AC coefficients needed up to here */
int zero_need; /* init the block with this many zeros */
int last_dc_val[3] = {0, 0, 0}; // or 128 for chroma?
int last_dc_val[3] = {0, 0, 0}; /* or 128 for chroma? */
int store_offs[4]; /* memory offsets: order of Y11 Y12 Y21 Y22 U V */
int restart = p_jpeg->restart_interval; /* MCUs until restart marker */
@ -1483,7 +1483,7 @@ int jpeg_decode(struct jpeg* p_jpeg, unsigned char* p_pixel[3],
for(y=0; y<p_jpeg->y_mbl && bs.next_input_byte <= bs.input_end; y++)
{
for (i=0; i<3; i++) // scan line init
for (i=0; i<3; i++) /* scan line init */
{
p_byte[i] = p_line[i];
p_line[i] += skip_strip[i];
@ -1567,7 +1567,7 @@ int jpeg_decode(struct jpeg* p_jpeg, unsigned char* p_pixel[3],
skip_line[ci]);
}
} /* for blkn */
p_byte[0] += skip_mcu[0]; // unrolled for (i=0; i<3; i++) loop
p_byte[0] += skip_mcu[0]; /* unrolled for (i=0; i<3; i++) loop */
p_byte[1] += skip_mcu[1];
p_byte[2] += skip_mcu[2];
if (p_jpeg->restart_interval && --restart == 0)

View file

@ -321,14 +321,14 @@ void recalc_parameters(void)
void init_mandelbrot_set(void)
{
#if CONFIG_LCD == LCD_SSD1815 /* Recorder, Ondio. */
x_min = -38L<<22; // -2.375<<26
x_max = 15L<<22; // 0.9375<<26
x_min = -38L<<22; /* -2.375<<26 */
x_max = 15L<<22; /* 0.9375<<26 */
#else /* all others (square pixels) */
x_min = -36L<<22; // -2.25<<26
x_max = 12L<<22; // 0.75<<26
x_min = -36L<<22; /* -2.25<<26 */
x_max = 12L<<22; /* 0.75<<26 */
#endif
y_min = -19L<<22; // -1.1875<<26
y_max = 19L<<22; // 1.1875<<26
y_min = -19L<<22; /* -1.1875<<26 */
y_max = 19L<<22; /* 1.1875<<26 */
recalc_parameters();
}

View file

@ -746,7 +746,7 @@ void play_tock(void) {
void calc_period(void)
{
period = 61440/bpm-1; // (60*1024)/bpm;
period = 61440/bpm-1; /* (60*1024)/bpm; */
}
@ -904,7 +904,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter){
rb = api;
if (MET_IS_PLAYING)
MET_PLAY_STOP; // stop audio IS
MET_PLAY_STOP; /* stop audio IS */
#if CONFIG_CODEC != SWCODEC
rb->bitswap(sound, sizeof(sound));

View file

@ -23,7 +23,7 @@
/* Only define LOCAL_DSP on Simulator or else we're asking for trouble */
#if defined(SIMULATOR)
/*Enable this to write to the soundcard via a /dsv/dsp symlink in */
//#define LOCAL_DSP
/*#define LOCAL_DSP */
#endif
@ -39,7 +39,7 @@
#include "../../plugin.h"
//#include "../codecs/lib/xxx2wav.h"
/*#include "../codecs/lib/xxx2wav.h" */
PLUGIN_HEADER
@ -200,14 +200,14 @@ int midimain(void * filename)
* why this happens.
*/
outputBuffer[outputBufferPosition]=outputSampleOne&0XFF; // Low byte first
outputBuffer[outputBufferPosition]=outputSampleOne&0XFF; /* Low byte first */
outputBufferPosition++;
outputBuffer[outputBufferPosition]=outputSampleOne>>8; //High byte second
outputBuffer[outputBufferPosition]=outputSampleOne>>8; /*High byte second */
outputBufferPosition++;
outputBuffer[outputBufferPosition]=outputSampleTwo&0XFF; // Low byte first
outputBuffer[outputBufferPosition]=outputSampleTwo&0XFF; /* Low byte first */
outputBufferPosition++;
outputBuffer[outputBufferPosition]=outputSampleTwo>>8; //High byte second
outputBuffer[outputBufferPosition]=outputSampleTwo>>8; /*High byte second */
outputBufferPosition++;

View file

@ -33,7 +33,7 @@ use F3 to see how many mines are left (supposing all your flags are correct)
PLUGIN_HEADER
//what the minesweeper() function can return
/*what the minesweeper() function can return */
#define MINESWEEPER_USB 3
#define MINESWEEPER_QUIT 2
#define MINESWEEPER_LOSE 1
@ -402,10 +402,10 @@ int minesweeper(void)
while(true){
//clear the screen buffer
/*clear the screen buffer */
rb->lcd_clear_display();
//display the mine field
/*display the mine field */
for(i=0;i<height;i++){
for(j=0;j<width;j++){
#if LCD_DEPTH > 1

View file

@ -1,15 +1,15 @@
// Shine is an MP3 encoder
// Copyright (C) 1999-2000 Gabriel Bouvigne
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Library General Public
// License as published by the Free Software Foundation; either
// version 2 of the License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Library General Public License for more details.
/* Shine is an MP3 encoder
* Copyright (C) 1999-2000 Gabriel Bouvigne
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details. */
#define samp_per_frame 1152
#define samp_per_frame2 576
@ -112,55 +112,55 @@ struct huffcodetab {
};
/* !!!!!!!! start of IRAM area: do not insert before x_int1 array !!!!!!!!!!!!! */
short x_int0 [HAN_SIZE] IBSS_ATTR; // 1024 Bytes
int mdct_freq [2][2][samp_per_frame2] IBSS_ATTR; // 9216 Bytes
short x_int1 [HAN_SIZE] IBSS_ATTR; // 1024 Bytes
short x_int0 [HAN_SIZE] IBSS_ATTR; /* 1024 Bytes */
int mdct_freq [2][2][samp_per_frame2] IBSS_ATTR; /* 9216 Bytes */
short x_int1 [HAN_SIZE] IBSS_ATTR; /* 1024 Bytes */
/* !!!!!!!!!!!!!!!!!!!!! here you may insert other data !!!!!!!!!!!!!!!!!!!!!!! */
uint8 int2idx [4096] IBSS_ATTR; // 4096 Bytes
enct8 enc_data [2][2][samp_per_frame2] IBSS_ATTR; // 4608 Bytes
short y_int [64] IBSS_ATTR; // 256 Bytes
int off [2] IBSS_ATTR; // 16 Bytes
int scalefac_long[23] IBSS_ATTR; // 96 Bytes
int mdct_in [36] IBSS_ATTR; // 144 Bytes
int sb_sample [2][3][18][SBLIMIT] IBSS_ATTR; // 13824 Bytes
BF_Data CodedData IBSS_ATTR; // 1040 Bytes
int ca_int [8] IBSS_ATTR; // 32 Bytes
int cs_int [8] IBSS_ATTR; // 32 Bytes
int win_int [18][36] IBSS_ATTR; // 2592 Bytes
short filter_int [SBLIMIT][64] IBSS_ATTR; // 8192 Bytes
short enwindow_int[512] IBSS_ATTR; // 1024 Bytes
uint8 ht_count1 [2][2][16] IBSS_ATTR; // 64 Bytes
uint16 t1HB [ 4] IBSS_ATTR; // Bytes
uint16 t2HB [ 9] IBSS_ATTR; // Bytes
uint16 t3HB [ 9] IBSS_ATTR; // Bytes
uint16 t5HB [ 16] IBSS_ATTR; // Bytes
uint16 t6HB [ 16] IBSS_ATTR; // Bytes
uint16 t7HB [ 36] IBSS_ATTR; // Bytes
uint16 t8HB [ 36] IBSS_ATTR; // Bytes
uint16 t9HB [ 36] IBSS_ATTR; // Bytes
uint16 t10HB [ 64] IBSS_ATTR; // Bytes
uint16 t11HB [ 64] IBSS_ATTR; // Bytes
uint16 t12HB [ 64] IBSS_ATTR; // Bytes
uint16 t13HB [256] IBSS_ATTR; // Bytes
uint16 t15HB [256] IBSS_ATTR; // Bytes
uint16 t16HB [256] IBSS_ATTR; // Bytes
uint16 t24HB [256] IBSS_ATTR; // Bytes
uint8 t1l [ 4] IBSS_ATTR; // Bytes
uint8 t2l [ 9] IBSS_ATTR; // Bytes
uint8 t3l [ 9] IBSS_ATTR; // Bytes
uint8 t5l [ 16] IBSS_ATTR; // Bytes
uint8 t6l [ 16] IBSS_ATTR; // Bytes
uint8 t7l [ 36] IBSS_ATTR; // Bytes
uint8 t8l [ 36] IBSS_ATTR; // Bytes
uint8 t9l [ 36] IBSS_ATTR; // Bytes
uint8 t10l [ 64] IBSS_ATTR; // Bytes
uint8 t11l [ 64] IBSS_ATTR; // Bytes
uint8 t12l [ 64] IBSS_ATTR; // Bytes
uint8 t13l [256] IBSS_ATTR; // Bytes
uint8 t15l [256] IBSS_ATTR; // Bytes
uint8 t16l [256] IBSS_ATTR; // Bytes
uint8 t24l [256] IBSS_ATTR; // Bytes
struct huffcodetab ht [HTN] IBSS_ATTR; // Bytes
uint8 int2idx [4096] IBSS_ATTR; /* 4096 Bytes */
enct8 enc_data [2][2][samp_per_frame2] IBSS_ATTR; /* 4608 Bytes */
short y_int [64] IBSS_ATTR; /* 256 Bytes */
int off [2] IBSS_ATTR; /* 16 Bytes */
int scalefac_long[23] IBSS_ATTR; /* 96 Bytes */
int mdct_in [36] IBSS_ATTR; /* 144 Bytes */
int sb_sample [2][3][18][SBLIMIT] IBSS_ATTR; /* 13824 Bytes */
BF_Data CodedData IBSS_ATTR; /* 1040 Bytes */
int ca_int [8] IBSS_ATTR; /* 32 Bytes */
int cs_int [8] IBSS_ATTR; /* 32 Bytes */
int win_int [18][36] IBSS_ATTR; /* 2592 Bytes */
short filter_int [SBLIMIT][64] IBSS_ATTR; /* 8192 Bytes */
short enwindow_int[512] IBSS_ATTR; /* 1024 Bytes */
uint8 ht_count1 [2][2][16] IBSS_ATTR; /* 64 Bytes */
uint16 t1HB [ 4] IBSS_ATTR; /* Bytes */
uint16 t2HB [ 9] IBSS_ATTR; /* Bytes */
uint16 t3HB [ 9] IBSS_ATTR; /* Bytes */
uint16 t5HB [ 16] IBSS_ATTR; /* Bytes */
uint16 t6HB [ 16] IBSS_ATTR; /* Bytes */
uint16 t7HB [ 36] IBSS_ATTR; /* Bytes */
uint16 t8HB [ 36] IBSS_ATTR; /* Bytes */
uint16 t9HB [ 36] IBSS_ATTR; /* Bytes */
uint16 t10HB [ 64] IBSS_ATTR; /* Bytes */
uint16 t11HB [ 64] IBSS_ATTR; /* Bytes */
uint16 t12HB [ 64] IBSS_ATTR; /* Bytes */
uint16 t13HB [256] IBSS_ATTR; /* Bytes */
uint16 t15HB [256] IBSS_ATTR; /* Bytes */
uint16 t16HB [256] IBSS_ATTR; /* Bytes */
uint16 t24HB [256] IBSS_ATTR; /* Bytes */
uint8 t1l [ 4] IBSS_ATTR; /* Bytes */
uint8 t2l [ 9] IBSS_ATTR; /* Bytes */
uint8 t3l [ 9] IBSS_ATTR; /* Bytes */
uint8 t5l [ 16] IBSS_ATTR; /* Bytes */
uint8 t6l [ 16] IBSS_ATTR; /* Bytes */
uint8 t7l [ 36] IBSS_ATTR; /* Bytes */
uint8 t8l [ 36] IBSS_ATTR; /* Bytes */
uint8 t9l [ 36] IBSS_ATTR; /* Bytes */
uint8 t10l [ 64] IBSS_ATTR; /* Bytes */
uint8 t11l [ 64] IBSS_ATTR; /* Bytes */
uint8 t12l [ 64] IBSS_ATTR; /* Bytes */
uint8 t13l [256] IBSS_ATTR; /* Bytes */
uint8 t15l [256] IBSS_ATTR; /* Bytes */
uint8 t16l [256] IBSS_ATTR; /* Bytes */
uint8 t24l [256] IBSS_ATTR; /* Bytes */
struct huffcodetab ht [HTN] IBSS_ATTR; /* Bytes */
static const uint8 ht_count1_const[2][2][16] =
{ { { 1, 5, 4, 5, 6, 5, 4, 4, 7, 3, 6, 0, 7, 2, 3, 1 }, /* table0 */
@ -240,7 +240,7 @@ const struct huffcodetab ht_const[HTN] =
{ 2, 2, 0, 0, t1HB, t1l},
{ 3, 3, 0, 0, t2HB, t2l},
{ 3, 3, 0, 0, t3HB, t3l},
{ 0, 0, 0, 0, NULL, NULL},// Apparently not used
{ 0, 0, 0, 0, NULL, NULL},/* Apparently not used */
{ 4, 4, 0, 0, t5HB, t5l},
{ 4, 4, 0, 0, t6HB, t6l},
{ 6, 6, 0, 0, t7HB, t7l},
@ -250,7 +250,7 @@ const struct huffcodetab ht_const[HTN] =
{ 8, 8, 0, 0,t11HB, t11l},
{ 8, 8, 0, 0,t12HB, t12l},
{16,16, 0, 0,t13HB, t13l},
{ 0, 0, 0, 0, NULL, NULL},// Apparently not used
{ 0, 0, 0, 0, NULL, NULL},/* Apparently not used */
{16,16, 0, 0,t15HB, t15l},
{16,16, 1, 1,t16HB, t16l},
{16,16, 2, 3,t16HB, t16l},
@ -1025,7 +1025,7 @@ int count_bit(enct8 ix[samp_per_frame2], unsigned int start, unsigned int end, u
ylen = h->ylen;
if(table > 15)
{ // ESC-table is used
{ /* ESC-table is used */
linbits = h->linbits;
for(i=start; i<end; i+=2)
{
@ -1532,7 +1532,7 @@ void filter_subband(short *buffer, int s[SBLIMIT], int k)
#endif
/* 147456=72*2048 */
for(i=SBLIMIT; i--; ) // SBLIMIT: 32
for(i=SBLIMIT; i--; ) /* SBLIMIT: 32 */
{
short *filt = filter_int[i];
@ -1691,11 +1691,11 @@ void compress(void)
memcpy(ht , ht_const , sizeof(ht ));
/* I don't know, wether this is really necessary */
ht[ 0].table = NULL; ht[ 0].hlen = NULL;// Apparently not used
ht[ 0].table = NULL; ht[ 0].hlen = NULL;/* Apparently not used */
ht[ 1].table = t1HB; ht[ 1].hlen = t1l;
ht[ 2].table = t2HB; ht[ 2].hlen = t2l;
ht[ 3].table = t3HB; ht[ 3].hlen = t3l;
ht[ 4].table = NULL; ht[ 4].hlen = NULL;// Apparently not used
ht[ 4].table = NULL; ht[ 4].hlen = NULL;/* Apparently not used */
ht[ 5].table = t5HB; ht[ 5].hlen = t5l;
ht[ 6].table = t6HB; ht[ 6].hlen = t6l;
ht[ 7].table = t7HB; ht[ 7].hlen = t7l;
@ -1705,7 +1705,7 @@ void compress(void)
ht[11].table = t11HB; ht[11].hlen = t11l;
ht[12].table = t12HB; ht[12].hlen = t12l;
ht[13].table = t13HB; ht[13].hlen = t13l;
ht[14].table = NULL; ht[14].hlen = NULL;// Apparently not used
ht[14].table = NULL; ht[14].hlen = NULL;/* Apparently not used */
ht[15].table = t15HB; ht[15].hlen = t15l;
ht[16].table = t16HB; ht[16].hlen = t16l;
ht[17].table = t16HB; ht[17].hlen = t16l;

View file

@ -326,7 +326,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
{
int ret;
rb = api; // copy to global api pointer
rb = api; /* copy to global api pointer */
(void)parameter;
if (rb->global_settings->backlight_timeout > 0)
rb->backlight_set_timeout(1);/* keep the light on */

View file

@ -448,19 +448,19 @@ static void star_display_text(char *str, bool waitkey)
line[chars_for_line] = '\0';
// test if we have cutted a word. If it is the case we don't have to
// skip the space
/* test if we have cutted a word. If it is the case we don't have to */
/* skip the space */
if (i == chars_by_line && chars_for_line == chars_by_line)
first_char_index += chars_for_line;
else
first_char_index += chars_for_line + 1;
// print the line on the screen
/* print the line on the screen */
rb->lcd_putsxy(0, current_line * char_height, line);
// if the number of line showed on the screen is equals to the
// maximum number of line we can show, we wait for a key pressed to
// clear and show the remaining text.
/* if the number of line showed on the screen is equals to the */
/* maximum number of line we can show, we wait for a key pressed to */
/* clear and show the remaining text. */
current_line++;
if (current_line == lines_by_screen || *ptr_char == '\0')
{

View file

@ -267,7 +267,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
{
int ret;
rb = api; // copy to global api pointer
rb = api; /* copy to global api pointer */
(void)parameter;
if (rb->global_settings->backlight_timeout > 0)
rb->backlight_set_timeout(1);/* keep the light on */
@ -277,4 +277,4 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
return ret;
}
#endif // #ifdef HAVE_LCD_BITMAP
#endif /* #ifdef HAVE_LCD_BITMAP */

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -161,7 +161,7 @@ static int wav2wv (char *filename)
num_chans = config.num_channels = native_header.NumChannels;
total_samples = native_header.data_ckSize / native_header.BlockAlign;
// config.flags |= CONFIG_HIGH_FLAG;
/* config.flags |= CONFIG_HIGH_FLAG; */
if (!WavpackSetConfiguration (wpc, &config, total_samples)) {
rb->splash(HZ*2, true, "internal error!");