Hopefully fix most of the errors and warnings from the last push
Change-Id: I1a466b2d55f120796910039a0296ca324c58e891
This commit is contained in:
parent
17a007bc60
commit
f3d60aea34
|
@ -40,6 +40,7 @@
|
||||||
#include "panic.h"
|
#include "panic.h"
|
||||||
#include "power.h"
|
#include "power.h"
|
||||||
#include "powermgmt.h"
|
#include "powermgmt.h"
|
||||||
|
#include "file_internal.h"
|
||||||
#include "file.h"
|
#include "file.h"
|
||||||
#include "version.h"
|
#include "version.h"
|
||||||
#include "loader_strerror.h"
|
#include "loader_strerror.h"
|
||||||
|
|
|
@ -36,7 +36,8 @@
|
||||||
|
|
||||||
/* for internal functions' scanning use to save quite a bit of stack space -
|
/* for internal functions' scanning use to save quite a bit of stack space -
|
||||||
access must be serialized by the writer lock */
|
access must be serialized by the writer lock */
|
||||||
#if defined(CPU_SH) || defined(IAUDIO_M5)
|
#if defined(CPU_SH) || defined(IAUDIO_M5) \
|
||||||
|
|| CONFIG_CPU == IMX233
|
||||||
/* otherwise, out of IRAM */
|
/* otherwise, out of IRAM */
|
||||||
struct fat_direntry dir_fatent;
|
struct fat_direntry dir_fatent;
|
||||||
#else
|
#else
|
||||||
|
|
|
@ -54,6 +54,7 @@
|
||||||
#else /* APPLICATION */
|
#else /* APPLICATION */
|
||||||
#ifdef __PCTOOL__
|
#ifdef __PCTOOL__
|
||||||
#define yield()
|
#define yield()
|
||||||
|
#define DEFAULT_CP_STATIC_ALLOC
|
||||||
#endif
|
#endif
|
||||||
#define open_noiso_internal open
|
#define open_noiso_internal open
|
||||||
#endif /* !APPLICATION */
|
#endif /* !APPLICATION */
|
||||||
|
@ -182,6 +183,23 @@ const char *get_current_codepage_name_linux(void)
|
||||||
}
|
}
|
||||||
#endif /* defined(APPLICATION) && defined(__linux__) */
|
#endif /* defined(APPLICATION) && defined(__linux__) */
|
||||||
|
|
||||||
|
#ifdef DEFAULT_CP_STATIC_ALLOC
|
||||||
|
static unsigned short default_cp_table_buf[MAX_CP_TABLE_SIZE+1];
|
||||||
|
#define cp_table_get_data(handle) \
|
||||||
|
default_cp_table_buf
|
||||||
|
#define cp_table_free(handle) \
|
||||||
|
do {} while (0)
|
||||||
|
#define cp_table_alloc(filename, size, opsp) \
|
||||||
|
({ (void)(opsp); 1; })
|
||||||
|
#else
|
||||||
|
#define cp_table_alloc(filename, size, opsp) \
|
||||||
|
core_alloc_ex((filename), (size), (opsp))
|
||||||
|
#define cp_table_free(handle) \
|
||||||
|
core_free(handle)
|
||||||
|
#define cp_table_get_data(handle) \
|
||||||
|
core_get_data(handle)
|
||||||
|
#endif
|
||||||
|
|
||||||
static const unsigned char utf8comp[6] =
|
static const unsigned char utf8comp[6] =
|
||||||
{
|
{
|
||||||
0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC
|
0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC
|
||||||
|
@ -233,9 +251,9 @@ static int alloc_and_load_cp_table(int cp, void *buf)
|
||||||
!(size % (off_t)sizeof (uint16_t))) {
|
!(size % (off_t)sizeof (uint16_t))) {
|
||||||
|
|
||||||
/* if the buffer is provided, use that but don't alloc */
|
/* if the buffer is provided, use that but don't alloc */
|
||||||
int handle = buf ? 0 : core_alloc_ex(filename, size, &ops);
|
int handle = buf ? 0 : cp_table_alloc(filename, size, &ops);
|
||||||
if (handle > 0)
|
if (handle > 0)
|
||||||
buf = core_get_data(handle);
|
buf = cp_table_get_data(handle);
|
||||||
|
|
||||||
if (buf && read(fd, buf, size) == size) {
|
if (buf && read(fd, buf, size) == size) {
|
||||||
close(fd);
|
close(fd);
|
||||||
|
@ -244,7 +262,7 @@ static int alloc_and_load_cp_table(int cp, void *buf)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (handle > 0)
|
if (handle > 0)
|
||||||
core_free(handle);
|
cp_table_free(handle);
|
||||||
}
|
}
|
||||||
|
|
||||||
close(fd);
|
close(fd);
|
||||||
|
@ -284,7 +302,7 @@ unsigned char* iso_decode(const unsigned char *iso, unsigned char *utf8,
|
||||||
if (tid == default_cp_tid) {
|
if (tid == default_cp_tid) {
|
||||||
/* use default table */
|
/* use default table */
|
||||||
if (default_cp_handle > 0) {
|
if (default_cp_handle > 0) {
|
||||||
table = core_get_data(default_cp_handle);
|
table = cp_table_get_data(default_cp_handle);
|
||||||
default_cp_table_ref++;
|
default_cp_table_ref++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -564,7 +582,7 @@ void set_codepage(int cp)
|
||||||
cp_lock_leave();
|
cp_lock_leave();
|
||||||
|
|
||||||
if (handle > 0)
|
if (handle > 0)
|
||||||
core_free(handle);
|
cp_table_free(handle);
|
||||||
}
|
}
|
||||||
|
|
||||||
int get_codepage(void)
|
int get_codepage(void)
|
||||||
|
|
|
@ -584,6 +584,7 @@ Lyre prototype 1 */
|
||||||
#define CONFIG_CPU 0
|
#define CONFIG_CPU 0
|
||||||
#undef HAVE_MULTIVOLUME
|
#undef HAVE_MULTIVOLUME
|
||||||
#undef HAVE_MULTIDRIVE
|
#undef HAVE_MULTIDRIVE
|
||||||
|
#undef CONFIG_STORAGE
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef APPLICATION
|
#ifdef APPLICATION
|
||||||
|
|
|
@ -28,7 +28,8 @@
|
||||||
#include "strtok_r.h"
|
#include "strtok_r.h"
|
||||||
#include "memset16.h"
|
#include "memset16.h"
|
||||||
|
|
||||||
#if defined(WIN32) || defined(APPLICATION)
|
#if defined(WIN32) || defined(APPLICATION) \
|
||||||
|
|| defined(__PCTOOL__)
|
||||||
#ifndef mempcpy
|
#ifndef mempcpy
|
||||||
#define mempcpy __builtin_mempcpy
|
#define mempcpy __builtin_mempcpy
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -192,7 +192,7 @@ int storage_num_drives(void)
|
||||||
|
|
||||||
int storage_driver_type(int drive)
|
int storage_driver_type(int drive)
|
||||||
{
|
{
|
||||||
if (drive >= num_drives)
|
if ((unsigned int)drive >= num_drives)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
unsigned int bit = (storage_drivers[drive] & DRIVER_MASK)>>DRIVER_OFFSET;
|
unsigned int bit = (storage_drivers[drive] & DRIVER_MASK)>>DRIVER_OFFSET;
|
||||||
|
|
|
@ -69,7 +69,7 @@ static const char *handle_special_links(const char* link, unsigned flags,
|
||||||
{
|
{
|
||||||
(void) flags;
|
(void) flags;
|
||||||
char vol_string[VOL_MAX_LEN + 1];
|
char vol_string[VOL_MAX_LEN + 1];
|
||||||
get_volume_name(-1, vol_string);
|
int len = get_volume_name(-1, vol_string);
|
||||||
|
|
||||||
/* link might be passed with or without HOME_DIR expanded. To handle
|
/* link might be passed with or without HOME_DIR expanded. To handle
|
||||||
* both perform substring matching (VOL_NAMES is unique enough) */
|
* both perform substring matching (VOL_NAMES is unique enough) */
|
||||||
|
@ -354,7 +354,7 @@ DIR * app_opendir(const char *dirname)
|
||||||
|
|
||||||
#ifdef HAVE_MULTIDRIVE
|
#ifdef HAVE_MULTIDRIVE
|
||||||
this->volumes_returned = INT_MAX; /* assume NOT $HOME */
|
this->volumes_returned = INT_MAX; /* assume NOT $HOME */
|
||||||
if (rbhome_fildes >= 0 && os_samefile(rbhome_fildes, fd) > 0)
|
if (rbhome_fildes >= 0 && os_fsamefile(rbhome_fildes, this->osfd) > 0)
|
||||||
this->volumes_returned = 0; /* there's no place like $HOME */
|
this->volumes_returned = 0; /* there's no place like $HOME */
|
||||||
#endif /* HAVE_MULTIDRIVE */
|
#endif /* HAVE_MULTIDRIVE */
|
||||||
|
|
||||||
|
|
|
@ -63,6 +63,7 @@ bool os_file_exists(const char *ospath);
|
||||||
#define _FILESYSTEM_HOSTED__DIR_H_
|
#define _FILESYSTEM_HOSTED__DIR_H_
|
||||||
|
|
||||||
#ifndef OSFUNCTIONS_DECLARED
|
#ifndef OSFUNCTIONS_DECLARED
|
||||||
|
int os_opendirfd(const char *osdirname);
|
||||||
int os_opendir_and_fd(const char *osdirname, OS_DIR_T **osdirpp,
|
int os_opendir_and_fd(const char *osdirname, OS_DIR_T **osdirpp,
|
||||||
int *osfdp);
|
int *osfdp);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue