diff options
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) uint8_t *yuv[3]; struct vo_rect thumb_rc; int thumb_width, thumb_height; +#ifdef HAVE_LCD_COLOR int thumb_uv_width, thumb_uv_height; +#endif /* Obtain rectangle as clipped to the screen */ 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) thumb_width = rc->r - rc->l; thumb_height = rc->b - rc->t; +#ifdef HAVE_LCD_COLOR thumb_uv_width = thumb_width / 2; thumb_uv_height = thumb_height / 2; DEBUGF("thumb: w: %d h: %d uvw: %d uvh: %d\n", thumb_width, thumb_height, thumb_uv_width, thumb_uv_height); +#else + DEBUGF("thumb: w: %d h: %d\n", thumb_width, thumb_height); +#endif /* Use remaining mpeg2 buffer as temp space */ 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 static int jz_nand_read_page(unsigned long page_addr, unsigned char *dst) { struct nand_param *nandp = &internal_param; - int page_size, oob_size, page_per_block; + int page_size, oob_size; int row_cycle, bus_width, ecc_count; int i; #ifdef USE_ECC @@ -355,7 +355,6 @@ static int jz_nand_read_page(unsigned long page_addr, unsigned char *dst) page_size = nandp->page_size; oob_size = nandp->oob_size; - page_per_block = nandp->page_per_block; row_cycle = nandp->row_cycle; bus_width = nandp->bus_width; 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 static int jz_nand_read_page(unsigned long page_addr, unsigned char *dst) { struct nand_param *nandp = &internal_param; - int page_size, oob_size, page_per_block; + int page_size, oob_size; int row_cycle, bus_width, ecc_count; int i; #ifdef USE_ECC @@ -351,7 +351,6 @@ static int jz_nand_read_page(unsigned long page_addr, unsigned char *dst) page_size = nandp->page_size; oob_size = nandp->oob_size; - page_per_block = nandp->page_per_block; row_cycle = nandp->row_cycle; bus_width = nandp->bus_width; 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) dummy = REG_SADC_BATDAT; dummy = REG_SADC_BATDAT; + (void)dummy; REG_SADC_ENA |= SADC_ENA_PBATEN; 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) dummy = REG_SADC_BATDAT; dummy = REG_SADC_BATDAT; - + (void)dummy; + REG_SADC_ENA |= SADC_ENA_PBATEN; bat_val = 0; |