X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=gp2x%2Fsoc_pollux.c;h=3b2ca2df26b6be1017e734fecee814dfabadd9d4;hb=df27781f266a5de7b83a57abc636166b26a8f186;hp=b6ec9ab138e9fe04586a1949aeaaf3641d02b841;hpb=b5bfb86438216d502f1f9ed14b923d3b0107c07d;p=libpicofe.git
diff --git a/gp2x/soc_pollux.c b/gp2x/soc_pollux.c
index b6ec9ab..3b2ca2d 100644
--- a/gp2x/soc_pollux.c
+++ b/gp2x/soc_pollux.c
@@ -1,3 +1,11 @@
+/*
+ *
+ * 00000000-029fffff linux (42MB)
+ * 02a00000-02dfffff fb (4MB, 153600B really used)
+ * 02e00000-02ffffff sound dma (2MB)
+ * 03000000-03ffffff MPEGDEC (?, 16MB)
+ *
+ */
#include
#include
#include
@@ -34,6 +42,17 @@ static unsigned int pllsetreg0;
static int last_pal_setting = 0;
+/* misc */
+static void pollux_set_fromenv(const char *env_var)
+{
+ const char *set_string;
+ set_string = getenv(env_var);
+ if (set_string)
+ pollux_set(memregs, set_string);
+ else
+ printf("env var %s not defined.\n", env_var);
+}
+
/* video stuff */
static void pollux_video_flip(int buf_count)
{
@@ -62,6 +81,7 @@ static void gp2x_video_changemode_ll_(int bpp)
int code = 0, bytes = 2;
int rot_cmd[2] = { 0, 0 };
unsigned int r;
+ char buff[32];
int ret;
if (bpp == prev_bpp)
@@ -79,7 +99,8 @@ static void gp2x_video_changemode_ll_(int bpp)
memregl[0x4000>>2] |= 1 << 3;
/* the above ioctl resets LCD timings, so set them here */
- set_lcd_custom_rate(last_pal_setting);
+ snprintf(buff, sizeof(buff), "POLLUX_LCD_TIMINGS_%s", last_pal_setting ? "PAL" : "NTSC");
+ pollux_set_fromenv(buff);
switch (abs(bpp))
{
@@ -141,17 +162,6 @@ static void gp2x_set_cpuclk_(unsigned int mhz)
cpuclk_was_changed = 1;
}
-/* misc */
-static void pollux_set_fromenv(const char *env_var)
-{
- const char *set_string;
- set_string = getenv(env_var);
- if (set_string)
- pollux_set(memregs, set_string);
- else
- printf("env var %s not defined.\n", env_var);
-}
-
/* RAM timings */
static void set_ram_timings_(void)
{
@@ -175,10 +185,7 @@ static void unset_ram_timings_(void)
/* LCD refresh */
static void set_lcd_custom_rate_(int is_pal)
{
- char buff[32];
-
- snprintf(buff, sizeof(buff), "POLLUX_LCD_TIMINGS_%s", is_pal ? "PAL" : "NTSC");
- pollux_set_fromenv(buff);
+ /* just remember PAL/NTSC. We always set timings in _changemode_ll() */
last_pal_setting = is_pal;
}
@@ -219,9 +226,10 @@ unsigned int gp2x_get_ticks_us_(void)
unsigned int gp2x_get_ticks_ms_(void)
{
+ /* approximate /= 1000 */
unsigned long long v64;
- v64 = (unsigned long long)gp2x_get_ticks_us_() * 4195;
- return v64 >> 22;
+ v64 = (unsigned long long)gp2x_get_ticks_us_() * 4294968;
+ return v64 >> 32;
}
static void timer_cleanup(void)