diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2018-10-09 22:29:28 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2018-10-09 22:35:37 -0400 |
commit | d2cef81bba743cc7ee209bddf81f1c1e97387250 (patch) | |
tree | db853303dfaca22e300f28f888d7a7a91f88f2c1 | |
parent | 53d72a8be1932a91e138920885a9e36c752460e0 (diff) | |
download | rockbox-d2cef81bba743cc7ee209bddf81f1c1e97387250.tar.gz rockbox-d2cef81bba743cc7ee209bddf81f1c1e97387250.zip |
mips: fix some compile warnings.
Change-Id: Ia5e83702313c1c184480290d3b0e6a66f01b7277
5 files changed, 11 insertions, 5 deletions
diff --git a/apps/plugins/mpegplayer/video_out_rockbox.c b/apps/plugins/mpegplayer/video_out_rockbox.c index c659600d41..b05a229083 100644 --- a/apps/plugins/mpegplayer/video_out_rockbox.c +++ b/apps/plugins/mpegplayer/video_out_rockbox.c | |||
@@ -371,7 +371,9 @@ bool vo_draw_frame_thumb(uint8_t * const * buf, const struct vo_rect *rc) | |||
371 | uint8_t *yuv[3]; | 371 | uint8_t *yuv[3]; |
372 | struct vo_rect thumb_rc; | 372 | struct vo_rect thumb_rc; |
373 | int thumb_width, thumb_height; | 373 | int thumb_width, thumb_height; |
374 | #ifdef HAVE_LCD_COLOR | ||
374 | int thumb_uv_width, thumb_uv_height; | 375 | int thumb_uv_width, thumb_uv_height; |
376 | #endif | ||
375 | 377 | ||
376 | /* Obtain rectangle as clipped to the screen */ | 378 | /* Obtain rectangle as clipped to the screen */ |
377 | vo_rect_set_ext(&thumb_rc, 0, 0, LCD_WIDTH, LCD_HEIGHT); | 379 | vo_rect_set_ext(&thumb_rc, 0, 0, LCD_WIDTH, LCD_HEIGHT); |
@@ -386,11 +388,15 @@ bool vo_draw_frame_thumb(uint8_t * const * buf, const struct vo_rect *rc) | |||
386 | 388 | ||
387 | thumb_width = rc->r - rc->l; | 389 | thumb_width = rc->r - rc->l; |
388 | thumb_height = rc->b - rc->t; | 390 | thumb_height = rc->b - rc->t; |
391 | #ifdef HAVE_LCD_COLOR | ||
389 | thumb_uv_width = thumb_width / 2; | 392 | thumb_uv_width = thumb_width / 2; |
390 | thumb_uv_height = thumb_height / 2; | 393 | thumb_uv_height = thumb_height / 2; |
391 | 394 | ||
392 | DEBUGF("thumb: w: %d h: %d uvw: %d uvh: %d\n", thumb_width, | 395 | DEBUGF("thumb: w: %d h: %d uvw: %d uvh: %d\n", thumb_width, |
393 | thumb_height, thumb_uv_width, thumb_uv_height); | 396 | thumb_height, thumb_uv_width, thumb_uv_height); |
397 | #else | ||
398 | DEBUGF("thumb: w: %d h: %d\n", thumb_width, thumb_height); | ||
399 | #endif | ||
394 | 400 | ||
395 | /* Use remaining mpeg2 buffer as temp space */ | 401 | /* Use remaining mpeg2 buffer as temp space */ |
396 | mem = mpeg2_get_buf(&bufsize); | 402 | mem = mpeg2_get_buf(&bufsize); |
diff --git a/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4740.c b/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4740.c index 0ce0ed1e19..1ae3bb2cc8 100644 --- a/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4740.c +++ b/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4740.c | |||
@@ -341,7 +341,7 @@ static int jz_nand_read_oob(unsigned long page_addr, unsigned char *buf, int siz | |||
341 | static int jz_nand_read_page(unsigned long page_addr, unsigned char *dst) | 341 | static int jz_nand_read_page(unsigned long page_addr, unsigned char *dst) |
342 | { | 342 | { |
343 | struct nand_param *nandp = &internal_param; | 343 | struct nand_param *nandp = &internal_param; |
344 | int page_size, oob_size, page_per_block; | 344 | int page_size, oob_size; |
345 | int row_cycle, bus_width, ecc_count; | 345 | int row_cycle, bus_width, ecc_count; |
346 | int i; | 346 | int i; |
347 | #ifdef USE_ECC | 347 | #ifdef USE_ECC |
@@ -355,7 +355,6 @@ static int jz_nand_read_page(unsigned long page_addr, unsigned char *dst) | |||
355 | 355 | ||
356 | page_size = nandp->page_size; | 356 | page_size = nandp->page_size; |
357 | oob_size = nandp->oob_size; | 357 | oob_size = nandp->oob_size; |
358 | page_per_block = nandp->page_per_block; | ||
359 | row_cycle = nandp->row_cycle; | 358 | row_cycle = nandp->row_cycle; |
360 | bus_width = nandp->bus_width; | 359 | bus_width = nandp->bus_width; |
361 | 360 | ||
diff --git a/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4760.c b/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4760.c index b3cc589528..3b1a1aad59 100644 --- a/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4760.c +++ b/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4760.c | |||
@@ -340,7 +340,7 @@ static int jz_nand_read_oob(unsigned long page_addr, unsigned char *buf, int siz | |||
340 | static int jz_nand_read_page(unsigned long page_addr, unsigned char *dst) | 340 | static int jz_nand_read_page(unsigned long page_addr, unsigned char *dst) |
341 | { | 341 | { |
342 | struct nand_param *nandp = &internal_param; | 342 | struct nand_param *nandp = &internal_param; |
343 | int page_size, oob_size, page_per_block; | 343 | int page_size, oob_size; |
344 | int row_cycle, bus_width, ecc_count; | 344 | int row_cycle, bus_width, ecc_count; |
345 | int i; | 345 | int i; |
346 | #ifdef USE_ECC | 346 | #ifdef USE_ECC |
@@ -351,7 +351,6 @@ static int jz_nand_read_page(unsigned long page_addr, unsigned char *dst) | |||
351 | 351 | ||
352 | page_size = nandp->page_size; | 352 | page_size = nandp->page_size; |
353 | oob_size = nandp->oob_size; | 353 | oob_size = nandp->oob_size; |
354 | page_per_block = nandp->page_per_block; | ||
355 | row_cycle = nandp->row_cycle; | 354 | row_cycle = nandp->row_cycle; |
356 | bus_width = nandp->bus_width; | 355 | bus_width = nandp->bus_width; |
357 | 356 | ||
diff --git a/firmware/target/mips/ingenic_jz47xx/onda_vx747/sadc-onda_vx747.c b/firmware/target/mips/ingenic_jz47xx/onda_vx747/sadc-onda_vx747.c index d06cb28f40..7d3b3a10d1 100644 --- a/firmware/target/mips/ingenic_jz47xx/onda_vx747/sadc-onda_vx747.c +++ b/firmware/target/mips/ingenic_jz47xx/onda_vx747/sadc-onda_vx747.c | |||
@@ -110,6 +110,7 @@ int _battery_voltage(void) | |||
110 | 110 | ||
111 | dummy = REG_SADC_BATDAT; | 111 | dummy = REG_SADC_BATDAT; |
112 | dummy = REG_SADC_BATDAT; | 112 | dummy = REG_SADC_BATDAT; |
113 | (void)dummy; | ||
113 | 114 | ||
114 | REG_SADC_ENA |= SADC_ENA_PBATEN; | 115 | REG_SADC_ENA |= SADC_ENA_PBATEN; |
115 | 116 | ||
diff --git a/firmware/target/mips/ingenic_jz47xx/onda_vx767/sadc-onda_vx767.c b/firmware/target/mips/ingenic_jz47xx/onda_vx767/sadc-onda_vx767.c index 710da6b729..ca9a0e617d 100644 --- a/firmware/target/mips/ingenic_jz47xx/onda_vx767/sadc-onda_vx767.c +++ b/firmware/target/mips/ingenic_jz47xx/onda_vx767/sadc-onda_vx767.c | |||
@@ -75,7 +75,8 @@ int _battery_voltage(void) | |||
75 | 75 | ||
76 | dummy = REG_SADC_BATDAT; | 76 | dummy = REG_SADC_BATDAT; |
77 | dummy = REG_SADC_BATDAT; | 77 | dummy = REG_SADC_BATDAT; |
78 | 78 | (void)dummy; | |
79 | |||
79 | REG_SADC_ENA |= SADC_ENA_PBATEN; | 80 | REG_SADC_ENA |= SADC_ENA_PBATEN; |
80 | bat_val = 0; | 81 | bat_val = 0; |
81 | 82 | ||