X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2Fsoc_mmsp2.c;h=67a5c7db8809d68ea56fe1230288a828b5dfcec2;hb=HEAD;hp=ee933d46a660a42663ba23a77f12a624ad7cf93e;hpb=f89d84717ae3536779f04cdfb57cf940d2bd8ade;p=libpicofe.git diff --git a/gp2x/soc_mmsp2.c b/gp2x/soc_mmsp2.c index ee933d4..67a5c7d 100644 --- a/gp2x/soc_mmsp2.c +++ b/gp2x/soc_mmsp2.c @@ -17,141 +17,37 @@ #include #include #include +#include #include +#include #include "soc.h" #include "soc_mmsp2.h" #include "plat_gp2x.h" -#include "../emu.h" +#include "../linux/sndout_oss.h" #include "../plat.h" -#include "../arm_utils.h" -#include "940ctl.h" -volatile unsigned short *gp2x_memregs; -volatile unsigned long *gp2x_memregl; -extern void *gp2x_screens[4]; -static int screensel = 0; - -int memdev = -1; /* used by code940 */ +static int mixerdev = -1; static int touchdev = -1; static int touchcal[7] = { 6203, 0, -1501397, 0, -4200, 16132680, 65536 }; -#define FRAMEBUFF_SIZE 0x30000 -#define FRAMEBUFF_WHOLESIZE (FRAMEBUFF_SIZE*4) // 320*240*2 + some more -#define FRAMEBUFF_ADDR0 (0x4000000 - FRAMEBUFF_WHOLESIZE) -#define FRAMEBUFF_ADDR1 (FRAMEBUFF_ADDR0 + FRAMEBUFF_SIZE) -#define FRAMEBUFF_ADDR2 (FRAMEBUFF_ADDR1 + FRAMEBUFF_SIZE) -#define FRAMEBUFF_ADDR3 (FRAMEBUFF_ADDR2 + FRAMEBUFF_SIZE) - -static const int gp2x_screenaddrs[4] = { FRAMEBUFF_ADDR0, FRAMEBUFF_ADDR1, FRAMEBUFF_ADDR2, FRAMEBUFF_ADDR3 }; -static int gp2x_screenaddrs_use[4]; - static char gamma_was_changed = 0; static char cpuclk_was_changed = 0; -static unsigned short gp2x_screenaddr_old[4]; static unsigned short memtimex_old[2]; static unsigned short reg0910; -/* video stuff */ -static void gp2x_video_flip_(void) -{ - unsigned short lsw = (unsigned short) gp2x_screenaddrs_use[screensel&3]; - unsigned short msw = (unsigned short)(gp2x_screenaddrs_use[screensel&3] >> 16); - - gp2x_memregs[0x2910>>1] = msw; - gp2x_memregs[0x2914>>1] = msw; - gp2x_memregs[0x290E>>1] = lsw; - gp2x_memregs[0x2912>>1] = lsw; - - // jump to other buffer: - g_screen_ptr = gp2x_screens[++screensel&3]; -} - -/* doulblebuffered flip */ -static void gp2x_video_flip2_(void) -{ - unsigned short msw = (unsigned short)(gp2x_screenaddrs_use[screensel&1] >> 16); - - gp2x_memregs[0x2910>>1] = msw; - gp2x_memregs[0x2914>>1] = msw; - gp2x_memregs[0x290E>>1] = 0; - gp2x_memregs[0x2912>>1] = 0; - - // jump to other buffer: - g_screen_ptr = gp2x_screens[++screensel&1]; -} - -static void gp2x_video_changemode_ll_(int bpp) -{ - gp2x_memregs[0x28DA>>1] = (((bpp+1)/8)<<9)|0xAB; /*8/15/16/24bpp...*/ - gp2x_memregs[0x290C>>1] = 320*((bpp+1)/8); /*line width in bytes*/ -} - -static void gp2x_video_setpalette_(int *pal, int len) -{ - unsigned short *g = (unsigned short *)pal; - volatile unsigned short *memreg = &gp2x_memregs[0x295A>>1]; - - gp2x_memregs[0x2958>>1] = 0; - - len *= 2; - while (len--) - *memreg = *g++; -} - -static void gp2x_video_RGB_setscaling_(int ln_offs, int W, int H) -{ - float escalaw, escalah; - int bpp = (gp2x_memregs[0x28DA>>1]>>9)&0x3; - unsigned short scalw; - - // set offset - gp2x_screenaddrs_use[0] = gp2x_screenaddrs[0] + ln_offs * 320 * bpp; - gp2x_screenaddrs_use[1] = gp2x_screenaddrs[1] + ln_offs * 320 * bpp; - gp2x_screenaddrs_use[2] = gp2x_screenaddrs[2] + ln_offs * 320 * bpp; - gp2x_screenaddrs_use[3] = gp2x_screenaddrs[3] + ln_offs * 320 * bpp; - - escalaw = 1024.0; // RGB Horiz LCD - escalah = 320.0; // RGB Vert LCD - - if (gp2x_memregs[0x2800>>1]&0x100) //TV-Out - { - escalaw=489.0; // RGB Horiz TV (PAL, NTSC) - if (gp2x_memregs[0x2818>>1] == 287) //PAL - escalah=274.0; // RGB Vert TV PAL - else if (gp2x_memregs[0x2818>>1] == 239) //NTSC - escalah=331.0; // RGB Vert TV NTSC - } - - // scale horizontal - scalw = (unsigned short)((float)escalaw *(W/320.0)); - /* if there is no horizontal scaling, vertical doesn't work. - * Here is a nasty wrokaround... */ - if (H != 240 && W == 320) scalw--; - gp2x_memregs[0x2906>>1]=scalw; - // scale vertical - gp2x_memregl[0x2908>>2]=(unsigned long)((float)escalah *bpp *(H/240.0)); -} - -static void gp2x_video_wait_vsync_(void) -{ - unsigned short v = gp2x_memregs[0x1182>>1]; - while (!((v ^ gp2x_memregs[0x1182>>1]) & 0x10)) - spend_cycles(1024); -} - /* 940 */ void pause940(int yes) { if (yes) - gp2x_memregs[0x0904>>1] &= 0xFFFE; + memregs[0x0904>>1] &= 0xFFFE; else - gp2x_memregs[0x0904>>1] |= 1; + memregs[0x0904>>1] |= 1; } void reset940(int yes, int bank) { - gp2x_memregs[0x3B48>>1] = ((yes&1) << 7) | (bank & 0x03); + memregs[0x3B48>>1] = ((yes&1) << 7) | (bank & 0x03); } /* @@ -164,7 +60,15 @@ void reset940(int yes, int bank) #define SYS_CLK_FREQ 7372800 -static void gp2x_set_cpuclk_(unsigned int mhz) +static int cpu_current_mhz = 200; + +static int mmsp2_clock_get(void) +{ + // TODO: read the actual value? + return cpu_current_mhz; +} + +static int mmsp2_clock_set(int mhz) { unsigned int mdiv, pdiv, sdiv = 0; unsigned int v; @@ -174,16 +78,18 @@ static void gp2x_set_cpuclk_(unsigned int mhz) mdiv = (mhz * pdiv * 1000000) / SYS_CLK_FREQ; if (mdiv & ~0xff) { fprintf(stderr, "invalid cpuclk MHz: %u\n", mhz); - return; + return -1; } v = ((mdiv-8)<<8) | ((pdiv-2)<<2) | sdiv; - gp2x_memregs[0x910>>1] = v; + memregs[0x910>>1] = v; for (i = 0; i < 10000; i++) - if (!(gp2x_memregs[0x902>>1] & 1)) + if (!(memregs[0x902>>1] & 1)) break; cpuclk_was_changed = 1; + cpu_current_mhz = mhz; + return 0; } /* RAM timings */ @@ -192,6 +98,14 @@ static void gp2x_set_cpuclk_(unsigned int mhz) if (t & ~mask) \ goto bad +static __attribute__((noinline)) void spend_cycles(int c) +{ + asm volatile( + "0: subs %0, %0, #1 ;" + "bgt 0b" + : "=r" (c) : "0" (c) : "cc"); +} + static void set_ram_timing_vals(int tCAS, int tRC, int tRAS, int tWR, int tMRD, int tRFC, int tRP, int tRCD) { int i; @@ -207,13 +121,13 @@ static void set_ram_timing_vals(int tCAS, int tRC, int tRAS, int tWR, int tMRD, /* get spend_cycles() into cache */ spend_cycles(1); - gp2x_memregs[0x3802>>1] = ((tMRD & 0xF) << 12) | ((tRFC & 0xF) << 8) | ((tRP & 0xF) << 4) | (tRCD & 0xF); - gp2x_memregs[0x3804>>1] = 0x8000 | ((tCAS & 1) << 12) | ((tRC & 0xF) << 8) | ((tRAS & 0xF) << 4) | (tWR & 0xF); + memregs[0x3802>>1] = ((tMRD & 0xF) << 12) | ((tRFC & 0xF) << 8) | ((tRP & 0xF) << 4) | (tRCD & 0xF); + memregs[0x3804>>1] = 0x8000 | ((tCAS & 1) << 12) | ((tRC & 0xF) << 8) | ((tRAS & 0xF) << 4) | (tWR & 0xF); /* be sure we don't access the mem while it's being reprogrammed */ spend_cycles(128*1024); for (i = 0; i < 8*1024; i++) - if (!(gp2x_memregs[0x3804>>1] & 0x8000)) + if (!(memregs[0x3804>>1] & 0x8000)) break; printf("RAM timings set.\n"); @@ -230,8 +144,8 @@ static void set_ram_timings_(void) static void unset_ram_timings_(void) { - gp2x_memregs[0x3802>>1] = memtimex_old[0]; - gp2x_memregs[0x3804>>1] = memtimex_old[1] | 0x8000; + memregs[0x3802>>1] = memtimex_old[0]; + memregs[0x3804>>1] = memtimex_old[1] | 0x8000; printf("RAM timings reset to startup values.\n"); } @@ -284,7 +198,7 @@ static void get_reg_setting(reg_setting *set) { for (; set->reg; set++) { - unsigned short val = gp2x_memregs[set->reg >> 1]; + unsigned short val = memregs[set->reg >> 1]; val &= set->valmask; set->val = val; } @@ -294,23 +208,24 @@ static void set_reg_setting(const reg_setting *set) { for (; set->reg; set++) { - unsigned short val = gp2x_memregs[set->reg >> 1]; + unsigned short val = memregs[set->reg >> 1]; val &= ~set->valmask; val |= set->val; - gp2x_memregs[set->reg >> 1] = val; + memregs[set->reg >> 1] = val; } } -static void set_lcd_custom_rate_(int is_pal) +static int mmsp2_lcdrate_set(int is_pal) { - if (gp2x_memregs[0x2800>>1] & 0x100) // tv-out - return; + if (memregs[0x2800>>1] & 0x100) // tv-out + return 0; printf("setting custom LCD refresh (%d Hz)... ", is_pal ? 100 : 120); fflush(stdout); set_reg_setting(is_pal ? lcd_rate_100 : lcd_rate_120); printf("done.\n"); + return 0; } static void unset_lcd_custom_rate_(void) @@ -321,14 +236,17 @@ static void unset_lcd_custom_rate_(void) static void set_lcd_gamma_(int g100, int A_SNs_curve) { - float gamma = (float) g100 / 100; + float gamma = (float) g100 / 100.0f; int i; gamma = 1 / gamma; + if (g100 == 100) + A_SNs_curve = 0; + /* enable gamma */ - gp2x_memregs[0x2880>>1] &= ~(1<<12); + memregs[0x2880>>1] &= ~(1<<12); - gp2x_memregs[0x295C>>1] = 0; + memregs[0x295C>>1] = 0; for (i = 0; i < 256; i++) { unsigned char g; @@ -351,22 +269,23 @@ static void set_lcd_gamma_(int g100, int A_SNs_curve) } else { - blah = i; + blah = (double)i; } g = (unsigned char)(255.0 * pow(blah/255.0, gamma)); //printf("%d : %d\n", i, g); s = (g<<8) | g; - gp2x_memregs[0x295E>>1]= s; - gp2x_memregs[0x295E>>1]= g; + memregs[0x295E>>1]= s; + memregs[0x295E>>1]= g; } gamma_was_changed = 1; } -static int gp2x_read_battery_(void) +static int mmsp2_gamma_set(int val, int black_level) { - return -1; /* TODO? */ + set_lcd_gamma_(val, 1); + return 0; } /* these are not quite MMSP2 related, @@ -429,11 +348,33 @@ static void proc_set(const char *path, const char *val) fclose(f); } +static int step_volume(int *volume, int diff) +{ + int ret, val; + + if (mixerdev < 0) + return -1; + + *volume += diff; + if (*volume >= 100) + *volume = 100; + else if (*volume < 0) + *volume = 0; + + val = *volume; + val |= val << 8; + + ret = ioctl(mixerdev, SOUND_MIXER_WRITE_PCM, &val); + if (ret == -1) { + perror("WRITE_PCM"); + return ret; + } + + return 0; +} void mmsp2_init(void) { - int i; - memdev = open("/dev/mem", O_RDWR); if (memdev == -1) { @@ -441,48 +382,23 @@ void mmsp2_init(void) exit(1); } - gp2x_memregs = mmap(0, 0x10000, PROT_READ|PROT_WRITE, MAP_SHARED, memdev, 0xc0000000); - if (gp2x_memregs == MAP_FAILED) + memregs = mmap(0, 0x10000, PROT_READ|PROT_WRITE, MAP_SHARED, memdev, 0xc0000000); + if (memregs == MAP_FAILED) { perror("mmap(memregs)"); exit(1); } - gp2x_memregl = (unsigned long *) gp2x_memregs; - - gp2x_memregs[0x2880>>1] &= ~0x383; // disable cursor, subpict, osd, video layers - - gp2x_screens[0] = mmap(0, FRAMEBUFF_WHOLESIZE, PROT_WRITE, MAP_SHARED, - memdev, gp2x_screenaddrs[0]); - if (gp2x_screens[0] == MAP_FAILED) - { - perror("mmap(g_screen_ptr)"); - exit(1); - } - printf("framebuffers:\n"); - printf(" %08x -> %p\n", gp2x_screenaddrs[0], gp2x_screens[0]); - for (i = 1; i < 4; i++) - { - gp2x_screens[i] = (char *) gp2x_screens[i - 1] + FRAMEBUFF_SIZE; - printf(" %08x -> %p\n", gp2x_screenaddrs[i], gp2x_screens[i]); - } + memregl = (volatile unsigned int *) memregs; - g_screen_ptr = gp2x_screens[0]; - screensel = 0; - - gp2x_screenaddr_old[0] = gp2x_memregs[0x290E>>1]; - gp2x_screenaddr_old[1] = gp2x_memregs[0x2910>>1]; - gp2x_screenaddr_old[2] = gp2x_memregs[0x2912>>1]; - gp2x_screenaddr_old[3] = gp2x_memregs[0x2914>>1]; - - memcpy(gp2x_screenaddrs_use, gp2x_screenaddrs, sizeof(gp2x_screenaddrs)); + memregs[0x2880>>1] &= ~0x383; // disable cursor, subpict, osd, video layers /* save startup values: LCD refresh */ get_reg_setting(lcd_rate_defaults); /* CPU and RAM timings */ - reg0910 = gp2x_memregs[0x0910>>1]; - memtimex_old[0] = gp2x_memregs[0x3802>>1]; - memtimex_old[1] = gp2x_memregs[0x3804>>1]; + reg0910 = memregs[0x0910>>1]; + memtimex_old[0] = memregs[0x3802>>1]; + memtimex_old[1] = memregs[0x3804>>1]; /* touchscreen */ touchdev = open("/dev/touchscreen/wm97xx", O_RDONLY); @@ -500,55 +416,40 @@ void mmsp2_init(void) proc_set("/proc/sys/vm/max-readahead", "0\n"); proc_set("/proc/sys/vm/min-readahead", "0\n"); - /* code940 portion */ - sharedmem940_init(); - - gp2x_video_flip = gp2x_video_flip_; - gp2x_video_flip2 = gp2x_video_flip2_; - gp2x_video_changemode_ll = gp2x_video_changemode_ll_; - gp2x_video_setpalette = gp2x_video_setpalette_; - gp2x_video_RGB_setscaling = gp2x_video_RGB_setscaling_; - gp2x_video_wait_vsync = gp2x_video_wait_vsync_; - - gp2x_set_cpuclk = gp2x_set_cpuclk_; + mixerdev = open("/dev/mixer", O_RDWR); + if (mixerdev == -1) + perror("open(/dev/mixer)"); - set_lcd_custom_rate = set_lcd_custom_rate_; - unset_lcd_custom_rate = unset_lcd_custom_rate_; - set_lcd_gamma = set_lcd_gamma_; + set_ram_timings_(); - set_ram_timings = set_ram_timings_; - unset_ram_timings = unset_ram_timings_; - gp2x_read_battery = gp2x_read_battery_; + plat_target.cpu_clock_get = mmsp2_clock_get; + plat_target.cpu_clock_set = mmsp2_clock_set; + plat_target.lcdrate_set = mmsp2_lcdrate_set; + plat_target.gamma_set = mmsp2_gamma_set; + plat_target.step_volume = step_volume; gp2x_get_ticks_ms = plat_get_ticks_ms_good; gp2x_get_ticks_us = plat_get_ticks_us_good; + + sndout_oss_can_restart = 0; } void mmsp2_finish(void) { reset940(1, 3); pause940(1); - sharedmem940_finish(); - - gp2x_video_RGB_setscaling_(0, 320, 240); - gp2x_video_changemode_ll_(16); - - gp2x_memregs[0x290E>>1] = gp2x_screenaddr_old[0]; - gp2x_memregs[0x2910>>1] = gp2x_screenaddr_old[1]; - gp2x_memregs[0x2912>>1] = gp2x_screenaddr_old[2]; - gp2x_memregs[0x2914>>1] = gp2x_screenaddr_old[3]; unset_lcd_custom_rate_(); if (gamma_was_changed) set_lcd_gamma_(100, 0); unset_ram_timings_(); if (cpuclk_was_changed) - gp2x_memregs[0x910>>1] = reg0910; + memregs[0x910>>1] = reg0910; - munmap(gp2x_screens[0], FRAMEBUFF_WHOLESIZE); - munmap((void *)gp2x_memregs, 0x10000); + munmap((void *)memregs, 0x10000); close(memdev); if (touchdev >= 0) close(touchdev); + if (mixerdev >= 0) + close(mixerdev); } -