forked from len0rd/rockbox
Missed a couple. Hopefully fix all warnings.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13234 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
26d242ae65
commit
8676dc25f5
22 changed files with 32 additions and 32 deletions
|
@ -604,7 +604,7 @@ static bool clipboard_pastefile(const char *src, const char *target, bool copy)
|
||||||
|
|
||||||
if (copy) {
|
if (copy) {
|
||||||
/* See if we can get the plugin buffer for the file copy buffer */
|
/* See if we can get the plugin buffer for the file copy buffer */
|
||||||
buffer = (char *) plugin_get_buffer(&buffersize);
|
buffer = (char *) plugin_get_buffer((size_t *)&buffersize);
|
||||||
if (buffer == NULL || buffersize < 512) {
|
if (buffer == NULL || buffersize < 512) {
|
||||||
/* Not large enough, try for a disk sector worth of stack instead */
|
/* Not large enough, try for a disk sector worth of stack instead */
|
||||||
buffersize = 512;
|
buffersize = 512;
|
||||||
|
|
|
@ -283,7 +283,7 @@ static bool playlist_viewer_init(struct playlist_viewer * viewer,
|
||||||
/* Nothing is playing, exit */
|
/* Nothing is playing, exit */
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
buffer = plugin_get_buffer(&buffer_size);
|
buffer = plugin_get_buffer((size_t *)&buffer_size);
|
||||||
if (!buffer)
|
if (!buffer)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
|
|
@ -1157,7 +1157,7 @@ int main(void* parameter)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* init the worker thread */
|
/* init the worker thread */
|
||||||
stack = rb->plugin_get_buffer(&stacksize); /* use the rest as stack */
|
stack = rb->plugin_get_buffer((size_t *)&stacksize); /* use the rest as stack */
|
||||||
stack = (void*)(((unsigned int)stack + 100) & ~3); /* a bit away, 32 bit align */
|
stack = (void*)(((unsigned int)stack + 100) & ~3); /* a bit away, 32 bit align */
|
||||||
stacksize = (stacksize - 100) & ~3;
|
stacksize = (stacksize - 100) & ~3;
|
||||||
if (stacksize < DEFAULT_STACK_SIZE)
|
if (stacksize < DEFAULT_STACK_SIZE)
|
||||||
|
|
|
@ -84,7 +84,7 @@ void *pl_malloc(ssize_t size)
|
||||||
/* init function for pl_malloc() */
|
/* init function for pl_malloc() */
|
||||||
void pl_malloc_init(void)
|
void pl_malloc_init(void)
|
||||||
{
|
{
|
||||||
bufptr = rb->plugin_get_buffer(&bufleft);
|
bufptr = rb->plugin_get_buffer((size_t *)&bufleft);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* for endian problems */
|
/* for endian problems */
|
||||||
|
|
|
@ -640,7 +640,7 @@ void DoUserDialog(char* filename)
|
||||||
char default_filename[32];
|
char default_filename[32];
|
||||||
int button;
|
int button;
|
||||||
int rc; /* generic return code */
|
int rc; /* generic return code */
|
||||||
int memleft;
|
ssize_t memleft;
|
||||||
tCheckROM result;
|
tCheckROM result;
|
||||||
bool is_romless;
|
bool is_romless;
|
||||||
|
|
||||||
|
@ -687,7 +687,7 @@ void DoUserDialog(char* filename)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* "allocate" memory */
|
/* "allocate" memory */
|
||||||
sector = rb->plugin_get_buffer(&memleft);
|
sector = rb->plugin_get_buffer((size_t *)&memleft);
|
||||||
if (memleft < SEC_SIZE) /* need buffer for a flash sector */
|
if (memleft < SEC_SIZE) /* need buffer for a flash sector */
|
||||||
{
|
{
|
||||||
rb->splash(HZ*3, "Out of memory");
|
rb->splash(HZ*3, "Out of memory");
|
||||||
|
@ -927,7 +927,7 @@ void DoUserDialog(char* filename)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* "allocate" memory */
|
/* "allocate" memory */
|
||||||
sector = rb->plugin_get_buffer(&memleft);
|
sector = rb->plugin_get_buffer((size_t *)&memleft);
|
||||||
if (memleft < SEC_SIZE) /* need buffer for a flash sector */
|
if (memleft < SEC_SIZE) /* need buffer for a flash sector */
|
||||||
{
|
{
|
||||||
rb->splash(HZ*3, "Out of memory");
|
rb->splash(HZ*3, "Out of memory");
|
||||||
|
|
|
@ -777,7 +777,7 @@ void DoUserDialog(char* filename)
|
||||||
return ;
|
return ;
|
||||||
}
|
}
|
||||||
|
|
||||||
audiobuf = rb->plugin_get_audio_buffer(&audiobuf_size);
|
audiobuf = rb->plugin_get_audio_buffer((size_t *)&audiobuf_size);
|
||||||
|
|
||||||
if (rb->strcasestr(filename, "/rockbox.iriver"))
|
if (rb->strcasestr(filename, "/rockbox.iriver"))
|
||||||
flash_rockbox(filename, SECT_RAMIMAGE);
|
flash_rockbox(filename, SECT_RAMIMAGE);
|
||||||
|
|
|
@ -139,7 +139,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
|
||||||
|
|
||||||
rb = api;
|
rb = api;
|
||||||
|
|
||||||
buf = rb->plugin_get_audio_buffer(&buf_size); /* start munching memory */
|
buf = rb->plugin_get_audio_buffer((size_t *)&buf_size); /* start munching memory */
|
||||||
|
|
||||||
stringbuffer = buf;
|
stringbuffer = buf;
|
||||||
|
|
||||||
|
|
|
@ -2298,9 +2298,9 @@ void get_pic_list(void)
|
||||||
tree = rb->tree_get_context();
|
tree = rb->tree_get_context();
|
||||||
|
|
||||||
#if PLUGIN_BUFFER_SIZE >= MIN_MEM
|
#if PLUGIN_BUFFER_SIZE >= MIN_MEM
|
||||||
file_pt = rb->plugin_get_buffer(&buf_size);
|
file_pt = rb->plugin_get_buffer((size_t *)&buf_size);
|
||||||
#else
|
#else
|
||||||
file_pt = rb->plugin_get_audio_buffer(&buf_size);
|
file_pt = rb->plugin_get_audio_buffer((size_t *)&buf_size);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
for(i = 0; i < tree->filesindir; i++)
|
for(i = 0; i < tree->filesindir; i++)
|
||||||
|
@ -3029,8 +3029,8 @@ int load_and_show(char* filename)
|
||||||
{
|
{
|
||||||
case JPEG_ZOOM_IN:
|
case JPEG_ZOOM_IN:
|
||||||
plug_buf = false;
|
plug_buf = false;
|
||||||
buf_images =
|
buf_images = rb->plugin_get_audio_buffer(
|
||||||
rb->plugin_get_audio_buffer(&buf_images_size);
|
(size_t *)&buf_images_size);
|
||||||
/*try again this file, now using the audio buffer */
|
/*try again this file, now using the audio buffer */
|
||||||
return PLUGIN_OTHER;
|
return PLUGIN_OTHER;
|
||||||
#ifdef JPEG_RC_MENU
|
#ifdef JPEG_RC_MENU
|
||||||
|
@ -3250,13 +3250,13 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
|
||||||
#if (PLUGIN_BUFFER_SIZE >= MIN_MEM) && !defined(SIMULATOR)
|
#if (PLUGIN_BUFFER_SIZE >= MIN_MEM) && !defined(SIMULATOR)
|
||||||
if(rb->audio_status())
|
if(rb->audio_status())
|
||||||
{
|
{
|
||||||
buf = rb->plugin_get_buffer(&buf_size) +
|
buf = rb->plugin_get_buffer((size_t *)&buf_size) +
|
||||||
(entries * sizeof(char**));
|
(entries * sizeof(char**));
|
||||||
buf_size -= (entries * sizeof(char**));
|
buf_size -= (entries * sizeof(char**));
|
||||||
plug_buf = true;
|
plug_buf = true;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
buf = rb->plugin_get_audio_buffer(&buf_size);
|
buf = rb->plugin_get_audio_buffer((size_t *)&buf_size);
|
||||||
#else
|
#else
|
||||||
buf = rb->plugin_get_audio_buffer(&buf_size) +
|
buf = rb->plugin_get_audio_buffer(&buf_size) +
|
||||||
(entries * sizeof(char**));
|
(entries * sizeof(char**));
|
||||||
|
|
|
@ -78,7 +78,7 @@ enum plugin_status run_overlay(struct plugin_api* rb, void* parameter,
|
||||||
return PLUGIN_ERROR;
|
return PLUGIN_ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
audiobuf = rb->plugin_get_audio_buffer(&audiobuf_size);
|
audiobuf = rb->plugin_get_audio_buffer((size_t *)&audiobuf_size);
|
||||||
if (header.load_addr < audiobuf ||
|
if (header.load_addr < audiobuf ||
|
||||||
header.end_addr > audiobuf + audiobuf_size)
|
header.end_addr > audiobuf + audiobuf_size)
|
||||||
{
|
{
|
||||||
|
|
|
@ -155,7 +155,7 @@ void *alloc(int size)
|
||||||
|
|
||||||
if (offset == NULL)
|
if (offset == NULL)
|
||||||
{
|
{
|
||||||
offset = rb->plugin_get_audio_buffer(&totalSize);
|
offset = rb->plugin_get_audio_buffer((size_t *)&totalSize);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (size + 4 > totalSize)
|
if (size + 4 > totalSize)
|
||||||
|
@ -192,7 +192,7 @@ void *alloc(int size)
|
||||||
|
|
||||||
if (offset == NULL)
|
if (offset == NULL)
|
||||||
{
|
{
|
||||||
offset = rb->plugin_get_audio_buffer(&totalSize);
|
offset = rb->plugin_get_audio_buffer((size_t *)&totalSize);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (size + 4 > totalSize)
|
if (size + 4 > totalSize)
|
||||||
|
|
|
@ -1672,7 +1672,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
buffer_size &= ~(0x7ff); /* Round buffer down to nearest 2KB */
|
buffer_size &= ~(0x7ff); /* Round buffer down to nearest 2KB */
|
||||||
DEBUGF("audiosize=%d, buffer_size=%ld\n",audiosize,buffer_size);
|
DEBUGF("audiosize=%ld, buffer_size=%ld\n",audiosize,buffer_size);
|
||||||
|
|
||||||
if (!init_mpabuf())
|
if (!init_mpabuf())
|
||||||
return PLUGIN_ERROR;
|
return PLUGIN_ERROR;
|
||||||
|
|
|
@ -160,7 +160,7 @@ void edit_list(void)
|
||||||
fd = rb->open(RFA_FILE,O_RDONLY);
|
fd = rb->open(RFA_FILE,O_RDONLY);
|
||||||
if (fd < 0)
|
if (fd < 0)
|
||||||
return;
|
return;
|
||||||
buffer = rb->plugin_get_audio_buffer(&buffer_size);
|
buffer = rb->plugin_get_audio_buffer((size_t *)&buffer_size);
|
||||||
if (!buffer)
|
if (!buffer)
|
||||||
return;
|
return;
|
||||||
rb->read(fd,buffer,buffer_size);
|
rb->read(fd,buffer,buffer_size);
|
||||||
|
|
|
@ -664,7 +664,7 @@ void DoUserDialog(char* filename)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* "allocate" memory */
|
/* "allocate" memory */
|
||||||
sector = rb->plugin_get_buffer(&memleft);
|
sector = rb->plugin_get_buffer((size_t *)&memleft);
|
||||||
if (memleft < SECTORSIZE) /* need buffer for a flash sector */
|
if (memleft < SECTORSIZE) /* need buffer for a flash sector */
|
||||||
{
|
{
|
||||||
rb->splash(HZ*3, "Out of memory");
|
rb->splash(HZ*3, "Out of memory");
|
||||||
|
@ -867,7 +867,7 @@ void DoUserDialog(char* filename)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* "allocate" memory */
|
/* "allocate" memory */
|
||||||
sector = rb->plugin_get_buffer(&memleft);
|
sector = rb->plugin_get_buffer((size_t *)&memleft);
|
||||||
if (memleft < SECTORSIZE) /* need buffer for a flash sector */
|
if (memleft < SECTORSIZE) /* need buffer for a flash sector */
|
||||||
{
|
{
|
||||||
rb->splash(HZ*3, "Out of memory");
|
rb->splash(HZ*3, "Out of memory");
|
||||||
|
|
|
@ -333,7 +333,7 @@ int load_all_levels(void)
|
||||||
|
|
||||||
/* Init the level_cache pointer and
|
/* Init the level_cache pointer and
|
||||||
calculate how many levels that will fit */
|
calculate how many levels that will fit */
|
||||||
level_cache = rb->plugin_get_buffer(&size);
|
level_cache = rb->plugin_get_buffer((size_t *)&size);
|
||||||
max_levels = size / (HEIGHT*WIDTH);
|
max_levels = size / (HEIGHT*WIDTH);
|
||||||
|
|
||||||
num_levels = 0;
|
num_levels = 0;
|
||||||
|
|
|
@ -185,7 +185,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
|
||||||
|
|
||||||
rb = api;
|
rb = api;
|
||||||
|
|
||||||
buf = rb->plugin_get_audio_buffer(&buf_size); /* start munching memory */
|
buf = rb->plugin_get_audio_buffer((size_t *)&buf_size); /* start munching memory */
|
||||||
|
|
||||||
stringbuffer = buf;
|
stringbuffer = buf;
|
||||||
pointers = (char **)(buf + buf_size - sizeof(int));
|
pointers = (char **)(buf + buf_size - sizeof(int));
|
||||||
|
|
|
@ -308,7 +308,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
|
||||||
|
|
||||||
(void)parameter;
|
(void)parameter;
|
||||||
rb = api;
|
rb = api;
|
||||||
audiobuf = rb->plugin_get_audio_buffer(&audiobufsize);
|
audiobuf = rb->plugin_get_audio_buffer((size_t *)&audiobufsize);
|
||||||
rb->srand(*rb->current_tick);
|
rb->srand(*rb->current_tick);
|
||||||
|
|
||||||
if (rb->global_settings->backlight_timeout > 0)
|
if (rb->global_settings->backlight_timeout > 0)
|
||||||
|
|
|
@ -268,7 +268,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void *parameter)
|
||||||
if (!parameter)
|
if (!parameter)
|
||||||
return PLUGIN_ERROR;
|
return PLUGIN_ERROR;
|
||||||
|
|
||||||
audiobuf = rb->plugin_get_audio_buffer(&audiobuflen);
|
audiobuf = rb->plugin_get_audio_buffer((size_t *)&audiobuflen);
|
||||||
|
|
||||||
#ifdef HAVE_ADJUSTABLE_CPU_FREQ
|
#ifdef HAVE_ADJUSTABLE_CPU_FREQ
|
||||||
rb->cpu_boost(true);
|
rb->cpu_boost(true);
|
||||||
|
|
|
@ -171,7 +171,7 @@ static struct
|
||||||
/* buffer information */
|
/* buffer information */
|
||||||
static struct
|
static struct
|
||||||
{
|
{
|
||||||
int bufsize;
|
ssize_t bufsize;
|
||||||
int granularity; /* common multiple of block and sector size */
|
int granularity; /* common multiple of block and sector size */
|
||||||
unsigned char* pBufStart; /* start of ring buffer */
|
unsigned char* pBufStart; /* start of ring buffer */
|
||||||
unsigned char* pBufEnd; /* end of ring buffer */
|
unsigned char* pBufEnd; /* end of ring buffer */
|
||||||
|
@ -867,7 +867,7 @@ int main(char* filename)
|
||||||
/* init buffer */
|
/* init buffer */
|
||||||
rb->memset(&gBuf, 0, sizeof(gBuf));
|
rb->memset(&gBuf, 0, sizeof(gBuf));
|
||||||
gBuf.pOSD = rb->lcd_framebuffer + LCD_WIDTH*7; /* last screen line */
|
gBuf.pOSD = rb->lcd_framebuffer + LCD_WIDTH*7; /* last screen line */
|
||||||
gBuf.pBufStart = rb->plugin_get_audio_buffer(&gBuf.bufsize);
|
gBuf.pBufStart = rb->plugin_get_audio_buffer((size_t *)&gBuf.bufsize);
|
||||||
/*gBuf.bufsize = 1700*1024; // test, like 2MB version!!!! */
|
/*gBuf.bufsize = 1700*1024; // test, like 2MB version!!!! */
|
||||||
gBuf.pBufFill = gBuf.pBufStart; /* all empty */
|
gBuf.pBufFill = gBuf.pBufStart; /* all empty */
|
||||||
|
|
||||||
|
|
|
@ -307,7 +307,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void *parameter)
|
||||||
if (!parameter)
|
if (!parameter)
|
||||||
return PLUGIN_ERROR;
|
return PLUGIN_ERROR;
|
||||||
|
|
||||||
audiobuf = rb->plugin_get_audio_buffer(&audiobuflen);
|
audiobuf = rb->plugin_get_audio_buffer((size_t *)&audiobuflen);
|
||||||
|
|
||||||
if (audiobuflen < 0x200000) {
|
if (audiobuflen < 0x200000) {
|
||||||
rb->splash(HZ*2, "not enough memory!");
|
rb->splash(HZ*2, "not enough memory!");
|
||||||
|
|
|
@ -3666,7 +3666,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
|
||||||
return PLUGIN_ERROR;
|
return PLUGIN_ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
aud_buf = rb->plugin_get_audio_buffer(&aud_size);
|
aud_buf = rb->plugin_get_audio_buffer((size_t *)&aud_size);
|
||||||
|
|
||||||
switch (play_file((char*)parameter))
|
switch (play_file((char*)parameter))
|
||||||
{
|
{
|
||||||
|
|
|
@ -367,7 +367,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void *parameter)
|
||||||
if (!parameter)
|
if (!parameter)
|
||||||
return PLUGIN_ERROR;
|
return PLUGIN_ERROR;
|
||||||
|
|
||||||
audiobuf = rb->plugin_get_audio_buffer(&audiobuflen);
|
audiobuf = rb->plugin_get_audio_buffer((size_t *)&audiobuflen);
|
||||||
|
|
||||||
if (!audiobuf)
|
if (!audiobuf)
|
||||||
{
|
{
|
||||||
|
|
|
@ -28,7 +28,7 @@ void *my_malloc(size_t size)
|
||||||
|
|
||||||
if (offset == NULL)
|
if (offset == NULL)
|
||||||
{
|
{
|
||||||
offset = rb->plugin_get_audio_buffer(&totalSize);
|
offset = rb->plugin_get_audio_buffer((size_t *)&totalSize);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (size + 4 > abs(totalSize) )
|
if (size + 4 > abs(totalSize) )
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue