forked from len0rd/rockbox
mips: fix some compile warnings.
Change-Id: Ia5e83702313c1c184480290d3b0e6a66f01b7277
This commit is contained in:
parent
53d72a8be1
commit
d2cef81bba
5 changed files with 11 additions and 5 deletions
|
@ -371,7 +371,9 @@ bool vo_draw_frame_thumb(uint8_t * const * buf, const struct vo_rect *rc)
|
||||||
uint8_t *yuv[3];
|
uint8_t *yuv[3];
|
||||||
struct vo_rect thumb_rc;
|
struct vo_rect thumb_rc;
|
||||||
int thumb_width, thumb_height;
|
int thumb_width, thumb_height;
|
||||||
|
#ifdef HAVE_LCD_COLOR
|
||||||
int thumb_uv_width, thumb_uv_height;
|
int thumb_uv_width, thumb_uv_height;
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Obtain rectangle as clipped to the screen */
|
/* Obtain rectangle as clipped to the screen */
|
||||||
vo_rect_set_ext(&thumb_rc, 0, 0, LCD_WIDTH, LCD_HEIGHT);
|
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_width = rc->r - rc->l;
|
||||||
thumb_height = rc->b - rc->t;
|
thumb_height = rc->b - rc->t;
|
||||||
|
#ifdef HAVE_LCD_COLOR
|
||||||
thumb_uv_width = thumb_width / 2;
|
thumb_uv_width = thumb_width / 2;
|
||||||
thumb_uv_height = thumb_height / 2;
|
thumb_uv_height = thumb_height / 2;
|
||||||
|
|
||||||
DEBUGF("thumb: w: %d h: %d uvw: %d uvh: %d\n", thumb_width,
|
DEBUGF("thumb: w: %d h: %d uvw: %d uvh: %d\n", thumb_width,
|
||||||
thumb_height, thumb_uv_width, thumb_uv_height);
|
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 */
|
/* Use remaining mpeg2 buffer as temp space */
|
||||||
mem = mpeg2_get_buf(&bufsize);
|
mem = mpeg2_get_buf(&bufsize);
|
||||||
|
|
|
@ -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)
|
static int jz_nand_read_page(unsigned long page_addr, unsigned char *dst)
|
||||||
{
|
{
|
||||||
struct nand_param *nandp = &internal_param;
|
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 row_cycle, bus_width, ecc_count;
|
||||||
int i;
|
int i;
|
||||||
#ifdef USE_ECC
|
#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;
|
page_size = nandp->page_size;
|
||||||
oob_size = nandp->oob_size;
|
oob_size = nandp->oob_size;
|
||||||
page_per_block = nandp->page_per_block;
|
|
||||||
row_cycle = nandp->row_cycle;
|
row_cycle = nandp->row_cycle;
|
||||||
bus_width = nandp->bus_width;
|
bus_width = nandp->bus_width;
|
||||||
|
|
||||||
|
|
|
@ -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)
|
static int jz_nand_read_page(unsigned long page_addr, unsigned char *dst)
|
||||||
{
|
{
|
||||||
struct nand_param *nandp = &internal_param;
|
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 row_cycle, bus_width, ecc_count;
|
||||||
int i;
|
int i;
|
||||||
#ifdef USE_ECC
|
#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;
|
page_size = nandp->page_size;
|
||||||
oob_size = nandp->oob_size;
|
oob_size = nandp->oob_size;
|
||||||
page_per_block = nandp->page_per_block;
|
|
||||||
row_cycle = nandp->row_cycle;
|
row_cycle = nandp->row_cycle;
|
||||||
bus_width = nandp->bus_width;
|
bus_width = nandp->bus_width;
|
||||||
|
|
||||||
|
|
|
@ -110,6 +110,7 @@ int _battery_voltage(void)
|
||||||
|
|
||||||
dummy = REG_SADC_BATDAT;
|
dummy = REG_SADC_BATDAT;
|
||||||
dummy = REG_SADC_BATDAT;
|
dummy = REG_SADC_BATDAT;
|
||||||
|
(void)dummy;
|
||||||
|
|
||||||
REG_SADC_ENA |= SADC_ENA_PBATEN;
|
REG_SADC_ENA |= SADC_ENA_PBATEN;
|
||||||
|
|
||||||
|
|
|
@ -75,7 +75,8 @@ int _battery_voltage(void)
|
||||||
|
|
||||||
dummy = REG_SADC_BATDAT;
|
dummy = REG_SADC_BATDAT;
|
||||||
dummy = REG_SADC_BATDAT;
|
dummy = REG_SADC_BATDAT;
|
||||||
|
(void)dummy;
|
||||||
|
|
||||||
REG_SADC_ENA |= SADC_ENA_PBATEN;
|
REG_SADC_ENA |= SADC_ENA_PBATEN;
|
||||||
bat_val = 0;
|
bat_val = 0;
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue