Coding Style cleanup, update CHANGELOG
Signed-off-by: Wolfgang Denk <wd@denx.de>
diff --git a/tools/easylogo/easylogo.c b/tools/easylogo/easylogo.c
index 6f2aaa6..080bea9 100644
--- a/tools/easylogo/easylogo.c
+++ b/tools/easylogo/easylogo.c
@@ -16,430 +16,423 @@
/*#define ENABLE_ASCII_BANNERS */
typedef struct {
- unsigned char id;
- unsigned char ColorMapType;
- unsigned char ImageTypeCode;
- unsigned short ColorMapOrigin;
- unsigned short ColorMapLenght;
- unsigned char ColorMapEntrySize;
- unsigned short ImageXOrigin;
- unsigned short ImageYOrigin;
- unsigned short ImageWidth;
- unsigned short ImageHeight;
- unsigned char ImagePixelSize;
- unsigned char ImageDescriptorByte;
+ unsigned char id;
+ unsigned char ColorMapType;
+ unsigned char ImageTypeCode;
+ unsigned short ColorMapOrigin;
+ unsigned short ColorMapLenght;
+ unsigned char ColorMapEntrySize;
+ unsigned short ImageXOrigin;
+ unsigned short ImageYOrigin;
+ unsigned short ImageWidth;
+ unsigned short ImageHeight;
+ unsigned char ImagePixelSize;
+ unsigned char ImageDescriptorByte;
} tga_header_t;
typedef struct {
- unsigned char r,g,b ;
-} rgb_t ;
+ unsigned char r, g, b;
+} rgb_t;
typedef struct {
- unsigned char b,g,r ;
-} bgr_t ;
+ unsigned char b, g, r;
+} bgr_t;
typedef struct {
- unsigned char Cb,y1,Cr,y2;
-} yuyv_t ;
+ unsigned char Cb, y1, Cr, y2;
+} yuyv_t;
typedef struct {
- void *data,
- *palette ;
- int width,
- height,
- pixels,
- bpp,
- pixel_size,
- size,
- palette_size,
- yuyv;
-} image_t ;
+ void *data, *palette;
+ int width, height, pixels, bpp, pixel_size, size, palette_size, yuyv;
+} image_t;
void StringUpperCase (char *str)
{
- int count = strlen(str);
- char c ;
+ int count = strlen (str);
+ char c;
- while(count--)
- {
- c=*str;
- if ((c >= 'a')&&(c<='z'))
- *str = 'A' + (c-'a');
- str++ ;
- }
+ while (count--) {
+ c = *str;
+ if ((c >= 'a') && (c <= 'z'))
+ *str = 'A' + (c - 'a');
+ str++;
+ }
}
void StringLowerCase (char *str)
{
- int count = strlen(str);
- char c ;
+ int count = strlen (str);
+ char c;
- while(count--)
- {
- c=*str;
- if ((c >= 'A')&&(c<='Z'))
- *str = 'a' + (c-'A');
- str++ ;
- }
+ while (count--) {
+ c = *str;
+ if ((c >= 'A') && (c <= 'Z'))
+ *str = 'a' + (c - 'A');
+ str++;
+ }
}
-void pixel_rgb_to_yuyv (rgb_t *rgb_pixel, yuyv_t *yuyv_pixel)
+void pixel_rgb_to_yuyv (rgb_t * rgb_pixel, yuyv_t * yuyv_pixel)
{
- unsigned int pR, pG, pB ;
+ unsigned int pR, pG, pB;
- /* Transform (0-255) components to (0-100) */
- pR = rgb_pixel->r * 100 / 255 ;
- pG = rgb_pixel->g * 100 / 255 ;
- pB = rgb_pixel->b * 100 / 255 ;
+ /* Transform (0-255) components to (0-100) */
+ pR = rgb_pixel->r * 100 / 255;
+ pG = rgb_pixel->g * 100 / 255;
+ pB = rgb_pixel->b * 100 / 255;
- /* Calculate YUV values (0-255) from RGB beetween 0-100 */
- yuyv_pixel->y1 = yuyv_pixel->y2 = 209 * (pR + pG + pB) / 300 + 16 ;
- yuyv_pixel->Cb = pB - (pR/4) - (pG*3/4) + 128 ;
- yuyv_pixel->Cr = pR - (pG*3/4) - (pB/4) + 128 ;
+ /* Calculate YUV values (0-255) from RGB beetween 0-100 */
+ yuyv_pixel->y1 = yuyv_pixel->y2 = 209 * (pR + pG + pB) / 300 + 16;
+ yuyv_pixel->Cb = pB - (pR / 4) - (pG * 3 / 4) + 128;
+ yuyv_pixel->Cr = pR - (pG * 3 / 4) - (pB / 4) + 128;
- return ;
+ return;
}
-void printlogo_rgb (rgb_t *data, int w, int h)
+void printlogo_rgb (rgb_t * data, int w, int h)
{
- int x,y;
- for (y=0; y<h; y++)
- {
- for (x=0; x<w; x++, data++)
- if ((data->r < 30)/*&&(data->g == 0)&&(data->b == 0)*/)
- printf(" ");
- else
- printf("X");
- printf("\n");
- }
+ int x, y;
+
+ for (y = 0; y < h; y++) {
+ for (x = 0; x < w; x++, data++)
+ if ((data->r <
+ 30) /*&&(data->g == 0)&&(data->b == 0) */ )
+ printf (" ");
+ else
+ printf ("X");
+ printf ("\n");
+ }
}
void printlogo_yuyv (unsigned short *data, int w, int h)
{
- int x,y;
- for (y=0; y<h; y++)
- {
- for (x=0; x<w; x++, data++)
- if (*data == 0x1080) /* Because of inverted on i386! */
- printf(" ");
- else
- printf("X");
- printf("\n");
- }
+ int x, y;
+
+ for (y = 0; y < h; y++) {
+ for (x = 0; x < w; x++, data++)
+ if (*data == 0x1080) /* Because of inverted on i386! */
+ printf (" ");
+ else
+ printf ("X");
+ printf ("\n");
+ }
}
static inline unsigned short le16_to_cpu (unsigned short val)
{
- union {
- unsigned char pval[2];
- unsigned short val;
- } swapped;
- swapped.val = val;
- return (swapped.pval[1] << 8) + swapped.pval[0];
+ union {
+ unsigned char pval[2];
+ unsigned short val;
+ } swapped;
+
+ swapped.val = val;
+ return (swapped.pval[1] << 8) + swapped.pval[0];
}
-int image_load_tga (image_t *image, char *filename)
+int image_load_tga (image_t * image, char *filename)
{
- FILE *file ;
- tga_header_t header ;
- int i;
- unsigned char app ;
- rgb_t *p ;
+ FILE *file;
+ tga_header_t header;
+ int i;
+ unsigned char app;
+ rgb_t *p;
- if( ( file = fopen( filename, "rb" ) ) == NULL )
- return -1;
+ if ((file = fopen (filename, "rb")) == NULL)
+ return -1;
- fread(&header, sizeof(header), 1, file);
+ fread (&header, sizeof (header), 1, file);
- /* byte swap: tga is little endian, host is ??? */
- header.ColorMapOrigin = le16_to_cpu (header.ColorMapOrigin);
- header.ColorMapLenght = le16_to_cpu (header.ColorMapLenght);
- header.ImageXOrigin = le16_to_cpu (header.ImageXOrigin);
- header.ImageYOrigin = le16_to_cpu (header.ImageYOrigin);
- header.ImageWidth = le16_to_cpu (header.ImageWidth);
- header.ImageHeight = le16_to_cpu (header.ImageHeight);
+ /* byte swap: tga is little endian, host is ??? */
+ header.ColorMapOrigin = le16_to_cpu (header.ColorMapOrigin);
+ header.ColorMapLenght = le16_to_cpu (header.ColorMapLenght);
+ header.ImageXOrigin = le16_to_cpu (header.ImageXOrigin);
+ header.ImageYOrigin = le16_to_cpu (header.ImageYOrigin);
+ header.ImageWidth = le16_to_cpu (header.ImageWidth);
+ header.ImageHeight = le16_to_cpu (header.ImageHeight);
- image->width = header.ImageWidth ;
- image->height = header.ImageHeight ;
+ image->width = header.ImageWidth;
+ image->height = header.ImageHeight;
- switch (header.ImageTypeCode){
- case 2: /* Uncompressed RGB */
- image->yuyv = 0 ;
- image->palette_size = 0 ;
- image->palette = NULL ;
- break;
+ switch (header.ImageTypeCode) {
+ case 2: /* Uncompressed RGB */
+ image->yuyv = 0;
+ image->palette_size = 0;
+ image->palette = NULL;
+ break;
default:
- printf("Format not supported!\n");
- return -1 ;
- }
+ printf ("Format not supported!\n");
+ return -1;
+ }
- image->bpp = header.ImagePixelSize ;
- image->pixel_size = ((image->bpp-1) / 8) + 1 ;
- image->pixels = image->width * image->height;
- image->size = image->pixels * image->pixel_size ;
- image->data = malloc(image->size) ;
+ image->bpp = header.ImagePixelSize;
+ image->pixel_size = ((image->bpp - 1) / 8) + 1;
+ image->pixels = image->width * image->height;
+ image->size = image->pixels * image->pixel_size;
+ image->data = malloc (image->size);
- if (image->bpp != 24)
- {
- printf("Bpp not supported: %d!\n", image->bpp);
- return -1 ;
- }
+ if (image->bpp != 24) {
+ printf ("Bpp not supported: %d!\n", image->bpp);
+ return -1;
+ }
- fread(image->data, image->size, 1, file);
+ fread (image->data, image->size, 1, file);
/* Swapping R and B values */
- p = image->data ;
- for(i=0; i < image->pixels; i++, p++)
- {
- app = p->r ;
- p->r = p->b ;
- p->b = app ;
- }
+ p = image->data;
+ for (i = 0; i < image->pixels; i++, p++) {
+ app = p->r;
+ p->r = p->b;
+ p->b = app;
+ }
/* Swapping image */
- if(!(header.ImageDescriptorByte & 0x20))
- {
- unsigned char *temp = malloc(image->size);
- int linesize = image->pixel_size * image->width ;
- void *dest = image->data,
- *source = temp + image->size - linesize ;
+ if (!(header.ImageDescriptorByte & 0x20)) {
+ unsigned char *temp = malloc (image->size);
+ int linesize = image->pixel_size * image->width;
+ void *dest = image->data,
+ *source = temp + image->size - linesize;
- printf("S");
- if (temp == NULL)
- {
- printf("Cannot alloc temp buffer!\n");
- return -1;
- }
-
- memcpy(temp, image->data, image->size);
- for(i = 0; i<image->height; i++, dest+=linesize, source-=linesize)
- memcpy(dest, source, linesize);
+ printf ("S");
+ if (temp == NULL) {
+ printf ("Cannot alloc temp buffer!\n");
+ return -1;
+ }
- free( temp );
- }
+ memcpy (temp, image->data, image->size);
+ for (i = 0; i < image->height;
+ i++, dest += linesize, source -= linesize)
+ memcpy (dest, source, linesize);
+ free (temp);
+ }
#ifdef ENABLE_ASCII_BANNERS
- printlogo_rgb (image->data,image->width, image->height);
+ printlogo_rgb (image->data, image->width, image->height);
#endif
- fclose (file);
- return 0;
+ fclose (file);
+ return 0;
}
-int image_free (image_t *image)
+int image_free (image_t * image)
{
- if(image->data != NULL)
- free(image->data);
+ if (image->data != NULL)
+ free (image->data);
- if(image->palette != NULL)
- free(image->palette);
+ if (image->palette != NULL)
+ free (image->palette);
return 0;
}
-int image_rgb_to_yuyv (image_t *rgb_image, image_t *yuyv_image)
+int image_rgb_to_yuyv (image_t * rgb_image, image_t * yuyv_image)
{
- rgb_t *rgb_ptr = (rgb_t *) rgb_image->data ;
- yuyv_t yuyv ;
- unsigned short *dest ;
- int count = 0 ;
+ rgb_t *rgb_ptr = (rgb_t *) rgb_image->data;
+ yuyv_t yuyv;
+ unsigned short *dest;
+ int count = 0;
- yuyv_image->pixel_size = 2 ;
- yuyv_image->bpp = 16 ;
- yuyv_image->yuyv = 1 ;
- yuyv_image->width = rgb_image->width ;
- yuyv_image->height = rgb_image->height ;
- yuyv_image->pixels = yuyv_image->width * yuyv_image->height ;
- yuyv_image->size = yuyv_image->pixels * yuyv_image->pixel_size ;
- dest = (unsigned short *) (yuyv_image->data = malloc(yuyv_image->size)) ;
- yuyv_image->palette = 0 ;
- yuyv_image->palette_size= 0 ;
+ yuyv_image->pixel_size = 2;
+ yuyv_image->bpp = 16;
+ yuyv_image->yuyv = 1;
+ yuyv_image->width = rgb_image->width;
+ yuyv_image->height = rgb_image->height;
+ yuyv_image->pixels = yuyv_image->width * yuyv_image->height;
+ yuyv_image->size = yuyv_image->pixels * yuyv_image->pixel_size;
+ dest = (unsigned short *) (yuyv_image->data =
+ malloc (yuyv_image->size));
+ yuyv_image->palette = 0;
+ yuyv_image->palette_size = 0;
- while((count++) < rgb_image->pixels)
- {
+ while ((count++) < rgb_image->pixels) {
pixel_rgb_to_yuyv (rgb_ptr++, &yuyv);
- if ((count & 1)==0) /* Was == 0 */
- memcpy (dest, ((void *)&yuyv) + 2, sizeof(short));
+ if ((count & 1) == 0) /* Was == 0 */
+ memcpy (dest, ((void *) &yuyv) + 2, sizeof (short));
else
- memcpy (dest, (void *)&yuyv, sizeof(short));
+ memcpy (dest, (void *) &yuyv, sizeof (short));
- dest ++ ;
+ dest++;
}
#ifdef ENABLE_ASCII_BANNERS
- printlogo_yuyv (yuyv_image->data, yuyv_image->width, yuyv_image->height);
+ printlogo_yuyv (yuyv_image->data, yuyv_image->width,
+ yuyv_image->height);
#endif
- return 0 ;
+ return 0;
}
-int image_save_header (image_t *image, char *filename, char *varname)
+int image_save_header (image_t * image, char *filename, char *varname)
{
- FILE *file = fopen (filename, "w");
- char app[256], str[256]="", def_name[64] ;
- int count = image->size, col=0;
- unsigned char *dataptr = image->data ;
- if (file==NULL)
- return -1 ;
+ FILE *file = fopen (filename, "w");
+ char app[256], str[256] = "", def_name[64];
+ int count = image->size, col = 0;
+ unsigned char *dataptr = image->data;
-/* Author information */
- fprintf(file, "/*\n * Generated by EasyLogo, (C) 2000 by Paolo Scaffardi\n *\n");
- fprintf(file, " * To use this, include it and call: easylogo_plot(screen,&%s, width,x,y)\n *\n", varname);
- fprintf(file, " * Where:\t'screen'\tis the pointer to the frame buffer\n");
- fprintf(file, " *\t\t'width'\tis the screen width\n");
- fprintf(file, " *\t\t'x'\t\tis the horizontal position\n");
- fprintf(file, " *\t\t'y'\t\tis the vertical position\n */\n\n");
+ if (file == NULL)
+ return -1;
-/* Headers */
- fprintf(file, "#include <video_easylogo.h>\n\n");
-/* Macros */
- strcpy(def_name, varname);
+ /* Author information */
+ fprintf (file,
+ "/*\n * Generated by EasyLogo, (C) 2000 by Paolo Scaffardi\n *\n");
+ fprintf (file,
+ " * To use this, include it and call: easylogo_plot(screen,&%s, width,x,y)\n *\n",
+ varname);
+ fprintf (file,
+ " * Where:\t'screen'\tis the pointer to the frame buffer\n");
+ fprintf (file, " *\t\t'width'\tis the screen width\n");
+ fprintf (file, " *\t\t'x'\t\tis the horizontal position\n");
+ fprintf (file, " *\t\t'y'\t\tis the vertical position\n */\n\n");
+
+ /* Headers */
+ fprintf (file, "#include <video_easylogo.h>\n\n");
+ /* Macros */
+ strcpy (def_name, varname);
StringUpperCase (def_name);
- fprintf(file, "#define DEF_%s_WIDTH\t\t%d\n", def_name, image->width);
- fprintf(file, "#define DEF_%s_HEIGHT\t\t%d\n", def_name, image->height);
- fprintf(file, "#define DEF_%s_PIXELS\t\t%d\n", def_name, image->pixels);
- fprintf(file, "#define DEF_%s_BPP\t\t%d\n", def_name, image->bpp);
- fprintf(file, "#define DEF_%s_PIXEL_SIZE\t%d\n", def_name, image->pixel_size);
- fprintf(file, "#define DEF_%s_SIZE\t\t%d\n\n", def_name, image->size);
-/* Declaration */
- fprintf(file, "unsigned char DEF_%s_DATA[DEF_%s_SIZE] = {\n", def_name, def_name);
+ fprintf (file, "#define DEF_%s_WIDTH\t\t%d\n", def_name,
+ image->width);
+ fprintf (file, "#define DEF_%s_HEIGHT\t\t%d\n", def_name,
+ image->height);
+ fprintf (file, "#define DEF_%s_PIXELS\t\t%d\n", def_name,
+ image->pixels);
+ fprintf (file, "#define DEF_%s_BPP\t\t%d\n", def_name, image->bpp);
+ fprintf (file, "#define DEF_%s_PIXEL_SIZE\t%d\n", def_name,
+ image->pixel_size);
+ fprintf (file, "#define DEF_%s_SIZE\t\t%d\n\n", def_name,
+ image->size);
+ /* Declaration */
+ fprintf (file, "unsigned char DEF_%s_DATA[DEF_%s_SIZE] = {\n",
+ def_name, def_name);
-/* Data */
- while(count)
- switch (col){
- case 0:
- sprintf(str, " 0x%02x", *dataptr++);
- col++;
- count-- ;
- break;
+ /* Data */
+ while (count)
+ switch (col) {
+ case 0:
+ sprintf (str, " 0x%02x", *dataptr++);
+ col++;
+ count--;
+ break;
- case 16:
- fprintf(file, "%s", str);
- if (count > 0)
- fprintf(file,",");
- fprintf(file, "\n");
+ case 16:
+ fprintf (file, "%s", str);
+ if (count > 0)
+ fprintf (file, ",");
+ fprintf (file, "\n");
- col = 0 ;
- break;
+ col = 0;
+ break;
- default:
- strcpy(app, str);
- sprintf(str, "%s, 0x%02x", app, *dataptr++);
- col++ ;
- count-- ;
- break;
+ default:
+ strcpy (app, str);
+ sprintf (str, "%s, 0x%02x", app, *dataptr++);
+ col++;
+ count--;
+ break;
}
if (col)
- fprintf(file, "%s\n", str);
+ fprintf (file, "%s\n", str);
-/* End of declaration */
- fprintf(file, "};\n\n");
-/* Variable */
- fprintf(file, "fastimage_t %s = {\n", varname);
- fprintf(file, " DEF_%s_DATA,\n", def_name);
- fprintf(file, " DEF_%s_WIDTH,\n", def_name);
- fprintf(file, " DEF_%s_HEIGHT,\n", def_name);
- fprintf(file, " DEF_%s_BPP,\n", def_name);
- fprintf(file, " DEF_%s_PIXEL_SIZE,\n", def_name);
- fprintf(file, " DEF_%s_SIZE\n};\n", def_name);
+ /* End of declaration */
+ fprintf (file, "};\n\n");
+ /* Variable */
+ fprintf (file, "fastimage_t %s = {\n", varname);
+ fprintf (file, " DEF_%s_DATA,\n", def_name);
+ fprintf (file, " DEF_%s_WIDTH,\n", def_name);
+ fprintf (file, " DEF_%s_HEIGHT,\n", def_name);
+ fprintf (file, " DEF_%s_BPP,\n", def_name);
+ fprintf (file, " DEF_%s_PIXEL_SIZE,\n", def_name);
+ fprintf (file, " DEF_%s_SIZE\n};\n", def_name);
fclose (file);
- return 0 ;
+ return 0;
}
#define DEF_FILELEN 256
int main (int argc, char *argv[])
{
- char
- inputfile[DEF_FILELEN],
- outputfile[DEF_FILELEN],
- varname[DEF_FILELEN];
+ char inputfile[DEF_FILELEN],
+ outputfile[DEF_FILELEN], varname[DEF_FILELEN];
- image_t rgb_logo, yuyv_logo ;
+ image_t rgb_logo, yuyv_logo;
- switch (argc){
- case 2:
- case 3:
- case 4:
- strcpy (inputfile, argv[1]);
+ switch (argc) {
+ case 2:
+ case 3:
+ case 4:
+ strcpy (inputfile, argv[1]);
- if (argc > 2)
- strcpy (varname, argv[2]);
- else
- {
- char *dot = strchr(inputfile, '.');
- int pos = dot - inputfile;
+ if (argc > 2)
+ strcpy (varname, argv[2]);
+ else {
+ char *dot = strchr (inputfile, '.');
+ int pos = dot - inputfile;
- if (dot)
- {
- strncpy (varname, inputfile, pos);
- varname[pos] = 0 ;
- }
- }
+ if (dot) {
+ strncpy (varname, inputfile, pos);
+ varname[pos] = 0;
+ }
+ }
- if (argc > 3)
- strcpy (outputfile, argv[3]);
- else
- {
- char *dot = strchr (varname, '.');
- int pos = dot - varname;
+ if (argc > 3)
+ strcpy (outputfile, argv[3]);
+ else {
+ char *dot = strchr (varname, '.');
+ int pos = dot - varname;
- if (dot)
- {
- char app[DEF_FILELEN] ;
+ if (dot) {
+ char app[DEF_FILELEN];
- strncpy(app, varname, pos);
- app[pos] = 0;
- sprintf(outputfile, "%s.h", app);
- }
- }
- break;
+ strncpy (app, varname, pos);
+ app[pos] = 0;
+ sprintf (outputfile, "%s.h", app);
+ }
+ }
+ break;
- default:
- printf("EasyLogo 1.0 (C) 2000 by Paolo Scaffardi\n\n");
+ default:
+ printf ("EasyLogo 1.0 (C) 2000 by Paolo Scaffardi\n\n");
- printf("Syntax: easylogo inputfile [outputvar {outputfile}] \n");
- printf("\n");
- printf("Where: 'inputfile' is the TGA image to load\n");
- printf(" 'outputvar' is the variable name to create\n");
- printf(" 'outputfile' is the output header file (default is 'inputfile.h')\n");
+ printf("Syntax: easylogo inputfile [outputvar {outputfile}] \n");
+ printf("\n");
+ printf("Where: 'inputfile' is the TGA image to load\n");
+ printf(" 'outputvar' is the variable name to create\n");
+ printf(" 'outputfile' is the output header file (default is 'inputfile.h')\n");
- return -1 ;
- }
+ return -1;
+ }
- printf("Doing '%s' (%s) from '%s'...",
- outputfile, varname, inputfile);
+ printf ("Doing '%s' (%s) from '%s'...",
+ outputfile, varname, inputfile);
-/* Import TGA logo */
+ /* Import TGA logo */
- printf("L");
- if (image_load_tga (&rgb_logo, inputfile)<0)
- {
- printf("input file not found!\n");
- exit(1);
- }
+ printf ("L");
+ if (image_load_tga (&rgb_logo, inputfile) < 0) {
+ printf ("input file not found!\n");
+ exit (1);
+ }
-/* Convert it to YUYV format */
+ /* Convert it to YUYV format */
- printf("C");
- image_rgb_to_yuyv (&rgb_logo, &yuyv_logo) ;
+ printf ("C");
+ image_rgb_to_yuyv (&rgb_logo, &yuyv_logo);
-/* Save it into a header format */
+ /* Save it into a header format */
- printf("S");
- image_save_header (&yuyv_logo, outputfile, varname) ;
+ printf ("S");
+ image_save_header (&yuyv_logo, outputfile, varname);
-/* Free original image and copy */
+ /* Free original image and copy */
- image_free (&rgb_logo);
- image_free (&yuyv_logo);
+ image_free (&rgb_logo);
+ image_free (&yuyv_logo);
- printf("\n");
+ printf ("\n");
- return 0 ;
+ return 0;
}