X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Flinux%2Fplat_mmap.c;fp=frontend%2Flinux%2Fplat.c;h=db661b6d941c6ce6adaea4d009fbad9f71b59ca4;hp=4ed1e65d6bd19db099bcf2c5b79df64487df30b8;hb=cc56203b76e1fcef2c7e55b460daf07e654a1547;hpb=0e2e3f498456d1175916ecd69d0a9e80e701e760 diff --git a/frontend/linux/plat.c b/frontend/linux/plat_mmap.c similarity index 51% rename from frontend/linux/plat.c rename to frontend/linux/plat_mmap.c index 4ed1e65d..db661b6d 100644 --- a/frontend/linux/plat.c +++ b/frontend/linux/plat_mmap.c @@ -12,14 +12,13 @@ #include #include #include -#include -#include -#include #include #include #include -#include "../common/plat.h" +// this is some dupe code to avoid libpicofe dep + +//#include "../libpicofe/plat.h" /* XXX: maybe unhardcode pagesize? */ #define HUGETLB_PAGESIZE (2 * 1024 * 1024) @@ -28,112 +27,6 @@ #define MAP_HUGETLB 0x40000 /* arch specific */ #endif - -int plat_is_dir(const char *path) -{ - DIR *dir; - if ((dir = opendir(path))) { - closedir(dir); - return 1; - } - return 0; -} - -int plat_get_root_dir(char *dst, int len) -{ - int j, ret; - - ret = readlink("/proc/self/exe", dst, len - 1); - if (ret < 0) { - perror("readlink"); - ret = 0; - } - dst[ret] = 0; - - for (j = strlen(dst); j > 0; j--) - if (dst[j] == '/') { - dst[++j] = 0; - break; - } - - return j; -} - -#ifdef __GP2X__ -/* Wiz has a borked gettimeofday().. */ -#define plat_get_ticks_ms plat_get_ticks_ms_good -#define plat_get_ticks_us plat_get_ticks_us_good -#endif - -unsigned int plat_get_ticks_ms(void) -{ - struct timeval tv; - unsigned int ret; - - gettimeofday(&tv, NULL); - - ret = (unsigned)tv.tv_sec * 1000; - /* approximate /= 1000 */ - ret += ((unsigned)tv.tv_usec * 4195) >> 22; - - return ret; -} - -unsigned int plat_get_ticks_us(void) -{ - struct timeval tv; - unsigned int ret; - - gettimeofday(&tv, NULL); - - ret = (unsigned)tv.tv_sec * 1000000; - ret += (unsigned)tv.tv_usec; - - return ret; -} - -void plat_sleep_ms(int ms) -{ - usleep(ms * 1000); -} - -int plat_wait_event(int *fds_hnds, int count, int timeout_ms) -{ - struct timeval tv, *timeout = NULL; - int i, ret, fdmax = -1; - fd_set fdset; - - if (timeout_ms >= 0) { - tv.tv_sec = timeout_ms / 1000; - tv.tv_usec = (timeout_ms % 1000) * 1000; - timeout = &tv; - } - - FD_ZERO(&fdset); - for (i = 0; i < count; i++) { - if (fds_hnds[i] > fdmax) fdmax = fds_hnds[i]; - FD_SET(fds_hnds[i], &fdset); - } - - ret = select(fdmax + 1, &fdset, NULL, NULL, timeout); - if (ret == -1) - { - perror("plat_wait_event: select failed"); - sleep(1); - return -1; - } - - if (ret == 0) - return -1; /* timeout */ - - ret = -1; - for (i = 0; i < count; i++) - if (FD_ISSET(fds_hnds[i], &fdset)) - ret = fds_hnds[i]; - - return ret; -} - void *plat_mmap(unsigned long addr, size_t size, int need_exec, int is_fixed) { static int hugetlb_disabled; @@ -196,14 +89,3 @@ void plat_munmap(void *ptr, size_t size) "munmap(%p, %zu) failed: %d\n", ptr, size, errno); } } - -/* lprintf */ -void lprintf(const char *fmt, ...) -{ - va_list vl; - - va_start(vl, fmt); - vprintf(fmt, vl); - va_end(vl); -} -