vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2009-12-27 Carles Pina i Estany <carles@pina.cat>

Browse source 
* video/readers/jpeg.c (cmd): Declare.
	(grub_cmd_jpegtest): Use `grub_command_t' type.
	(GRUB_MOD_INIT): Fix arguments passed to `grub_register_command'.
	Assign to `cmd'.
	(GRUB_MOD_FINI): Use `cmd' to unregister.
	* video/readers/png.c (cmd): Declare.
	(grub_cmd_pngtest): Use `grub_command_t' type.
	(GRUB_MOD_INIT): Fix arguments passed to `grub_register_command'.
	Assign to `cmd'.
	(GRUB_MOD_FINI): Use `cmd' to unregister.
	* video/readers/tga.c (cmd): Declare.
	(grub_cmd_tgatest): Use `grub_command_t' type.
	(GRUB_MOD_INIT): Fix arguments passed to `grub_register_command'.
	Assign to `cmd'.
	(GRUB_MOD_FINI): Use `cmd' to unregister.
This commit is contained in:
carles 2009-12-26 12:06:35 +01:00
parent 864ba2bbca
commit c541b01a66
4 changed files with 43 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
ChangeLog
View file

@ -1,3 +1,21 @@
2009-12-27 Carles Pina i Estany <carles@pina.cat>
* video/readers/jpeg.c (cmd): Declare.
(grub_cmd_jpegtest): Use `grub_command_t' type.
(GRUB_MOD_INIT): Fix arguments passed to `grub_register_command'.
Assign to `cmd'.
(GRUB_MOD_FINI): Use `cmd' to unregister.
* video/readers/png.c (cmd): Declare.
(grub_cmd_pngtest): Use `grub_command_t' type.
(GRUB_MOD_INIT): Fix arguments passed to `grub_register_command'.
Assign to `cmd'.
(GRUB_MOD_FINI): Use `cmd' to unregister.
* video/readers/tga.c (cmd): Declare.
(grub_cmd_tgatest): Use `grub_command_t' type.
(GRUB_MOD_INIT): Fix arguments passed to `grub_register_command'.
Assign to `cmd'.
(GRUB_MOD_FINI): Use `cmd' to unregister.
2009-12-27 Carles Pina i Estany <carles@pina.cat> 2009-12-27 Carles Pina i Estany <carles@pina.cat>
* efiemu/main.c (GRUB_MOD_INIT): Fix capitalizations and/or full * efiemu/main.c (GRUB_MOD_INIT): Fix capitalizations and/or full

18
video/readers/jpeg.c
View file

@ -54,6 +54,10 @@ static const grub_uint8_t jpeg_zigzag_order[64] = {
53, 60, 61, 54, 47, 55, 62, 63 53, 60, 61, 54, 47, 55, 62, 63
}; };
#ifdef JPEG_DEBUG
static grub_command_t cmd;
#endif
typedef int jpeg_data_unit_t[64]; typedef int jpeg_data_unit_t[64];
struct grub_jpeg_data struct grub_jpeg_data
@ -695,8 +699,8 @@ grub_video_reader_jpeg (struct grub_video_bitmap **bitmap,
#if defined(JPEG_DEBUG) #if defined(JPEG_DEBUG)
static grub_err_t static grub_err_t
grub_cmd_jpegtest (struct grub_arg_list *state __attribute__ ((unused)), grub_cmd_jpegtest (grub_command_t cmd __attribute__ ((unused)),
int argc, char **args) int argc, char **args)
{ {
struct grub_video_bitmap *bitmap = 0; struct grub_video_bitmap *bitmap = 0;
@ -730,16 +734,16 @@ GRUB_MOD_INIT (video_reader_jpeg)
grub_video_bitmap_reader_register (&jpg_reader); grub_video_bitmap_reader_register (&jpg_reader);
grub_video_bitmap_reader_register (&jpeg_reader); grub_video_bitmap_reader_register (&jpeg_reader);
#if defined(JPEG_DEBUG) #if defined(JPEG_DEBUG)
grub_register_command ("jpegtest", grub_cmd_jpegtest, cmd = grub_register_command ("jpegtest", grub_cmd_jpegtest,
GRUB_COMMAND_FLAG_BOTH, "FILE", "FILE",
"Tests loading of JPEG bitmap.", 0); "Tests loading of JPEG bitmap.");
#endif #endif
} }
GRUB_MOD_FINI (video_reader_jpeg) GRUB_MOD_FINI (grub_cmd_jpegtest)
{ {
#if defined(JPEG_DEBUG) #if defined(JPEG_DEBUG)
grub_unregister_command ("jpegtest"); grub_unregister_command (cmd);
#endif #endif
grub_video_bitmap_reader_unregister (&jpeg_reader); grub_video_bitmap_reader_unregister (&jpeg_reader);
grub_video_bitmap_reader_unregister (&jpg_reader); grub_video_bitmap_reader_unregister (&jpg_reader);

14
video/readers/png.c
View file

@ -73,6 +73,10 @@
#define DEFLATE_HUFF_LEN 16 #define DEFLATE_HUFF_LEN 16
#ifdef PNG_DEBUG
static grub_command_t cmd;
#endif
struct huff_table struct huff_table
{ {
int *values, *maxval, *offset; int *values, *maxval, *offset;
@ -866,7 +870,7 @@ grub_video_reader_png (struct grub_video_bitmap **bitmap,
#if defined(PNG_DEBUG) #if defined(PNG_DEBUG)
static grub_err_t static grub_err_t
grub_cmd_pngtest (struct grub_arg_list *state __attribute__ ((unused)), grub_cmd_pngtest (grub_command_t cmd __attribute__ ((unused)),
int argc, char **args) int argc, char **args)
{ {
struct grub_video_bitmap *bitmap = 0; struct grub_video_bitmap *bitmap = 0;
@ -894,16 +898,16 @@ GRUB_MOD_INIT (video_reader_png)
{ {
grub_video_bitmap_reader_register (&png_reader); grub_video_bitmap_reader_register (&png_reader);
#if defined(PNG_DEBUG) #if defined(PNG_DEBUG)
grub_register_command ("pngtest", grub_cmd_pngtest, cmd = grub_register_command ("pngtest", grub_cmd_pngtest,
GRUB_COMMAND_FLAG_BOTH, "FILE", "FILE",
"Tests loading of PNG bitmap.", 0); "Tests loading of PNG bitmap.");
#endif #endif
} }
GRUB_MOD_FINI (video_reader_png) GRUB_MOD_FINI (video_reader_png)
{ {
#if defined(PNG_DEBUG) #if defined(PNG_DEBUG)
grub_unregister_command ("pngtest"); grub_unregister_command (cmd);
#endif #endif
grub_video_bitmap_reader_unregister (&png_reader); grub_video_bitmap_reader_unregister (&png_reader);
} }

9
video/readers/tga.c
View file

@ -29,6 +29,7 @@
#if defined(TGA_DEBUG) #if defined(TGA_DEBUG)
#define dump_int_field(x) grub_printf( #x " = %d (0x%04x)\n", x, x); #define dump_int_field(x) grub_printf( #x " = %d (0x%04x)\n", x, x);
static grub_command_t cmd;
#endif #endif
enum enum
@ -452,7 +453,7 @@ grub_video_reader_tga (struct grub_video_bitmap **bitmap,
#if defined(TGA_DEBUG) #if defined(TGA_DEBUG)
static grub_err_t static grub_err_t
grub_cmd_tgatest (struct grub_arg_list *state __attribute__ ((unused)), grub_cmd_tgatest (grub_command_t cmd __attribute__ ((unused)),
int argc, char **args) int argc, char **args)
{ {
struct grub_video_bitmap *bitmap = 0; struct grub_video_bitmap *bitmap = 0;
@ -480,15 +481,15 @@ GRUB_MOD_INIT(video_reader_tga)
{ {
grub_video_bitmap_reader_register (&tga_reader); grub_video_bitmap_reader_register (&tga_reader);
#if defined(TGA_DEBUG) #if defined(TGA_DEBUG)
grub_register_command ("tgatest", grub_cmd_tgatest, GRUB_COMMAND_FLAG_BOTH, cmd = grub_register_command ("tgatest", grub_cmd_tgatest,
"FILE", "Tests loading of TGA bitmap.", 0); "FILE", "Tests loading of TGA bitmap.");
#endif #endif
} }
GRUB_MOD_FINI(video_reader_tga) GRUB_MOD_FINI(video_reader_tga)
{ {
#if defined(TGA_DEBUG) #if defined(TGA_DEBUG)
grub_unregister_command ("tgatest"); grub_unregister_command (cmd);
#endif #endif
grub_video_bitmap_reader_unregister (&tga_reader); grub_video_bitmap_reader_unregister (&tga_reader);
} }