--- /dev/null
+[submodule "common/warm"]
+ path = common/warm
+ url = git://notaz.gp2x.de/~notaz/warm.git
+++ /dev/null
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <sys/mman.h>
-#include <unistd.h>
-#include <linux/fb.h>
-#include <linux/matroxfb.h>
-
-#include "fbdev.h"
-
-#define FBDEV_MAX_BUFFERS 3
-
-struct vout_fbdev {
- int fd;
- void *mem;
- size_t mem_size;
- struct fb_var_screeninfo fbvar_old;
- struct fb_var_screeninfo fbvar_new;
- int buffer_write;
- void *buffers[FBDEV_MAX_BUFFERS];
- int buffer_count;
-};
-
-void *vout_fbdev_flip(struct vout_fbdev *fbdev)
-{
- int draw_buf;
-
- if (fbdev->buffer_count < 2)
- return fbdev->mem;
-
- draw_buf = fbdev->buffer_write;
- fbdev->buffer_write++;
- if (fbdev->buffer_write >= fbdev->buffer_count)
- fbdev->buffer_write = 0;
-
- fbdev->fbvar_new.yoffset = fbdev->fbvar_old.yres * draw_buf;
-
- ioctl(fbdev->fd, FBIOPAN_DISPLAY, &fbdev->fbvar_new);
-
- return fbdev->buffers[fbdev->buffer_write];
-}
-
-void vout_fbdev_wait_vsync(struct vout_fbdev *fbdev)
-{
- int arg = 0;
- ioctl(fbdev->fd, FBIO_WAITFORVSYNC, &arg);
-}
-
-void vout_fbdev_clear(struct vout_fbdev *fbdev)
-{
- memset(fbdev->mem, 0, fbdev->mem_size);
-}
-
-struct vout_fbdev *vout_fbdev_init(const char *fbdev_name, int *w, int *h, int no_dblbuf)
-{
- struct vout_fbdev *fbdev;
- int i, ret;
-
- fbdev = calloc(1, sizeof(*fbdev));
- if (fbdev == NULL)
- return NULL;
-
- fbdev->fd = open(fbdev_name, O_RDWR);
- if (fbdev->fd == -1) {
- fprintf(stderr, "%s: ", fbdev_name);
- perror("open");
- goto fail_open;
- }
-
- ret = ioctl(fbdev->fd, FBIOGET_VSCREENINFO, &fbdev->fbvar_old);
- if (ret == -1) {
- perror("FBIOGET_VSCREENINFO ioctl");
- goto fail;
- }
-
- fbdev->fbvar_new = fbdev->fbvar_old;
- printf("%s: %ix%i@%d\n", fbdev_name, fbdev->fbvar_old.xres, fbdev->fbvar_old.yres,
- fbdev->fbvar_old.bits_per_pixel);
- *w = fbdev->fbvar_old.xres;
- *h = fbdev->fbvar_old.yres;
- fbdev->buffer_count = FBDEV_MAX_BUFFERS; // be optimistic
- if (no_dblbuf)
- fbdev->buffer_count = 1;
-
- if (fbdev->fbvar_new.bits_per_pixel != 16) {
- printf(" switching to 16bpp\n");
- fbdev->fbvar_new.bits_per_pixel = 16;
- ret = ioctl(fbdev->fd, FBIOPUT_VSCREENINFO, &fbdev->fbvar_new);
- if (ret == -1) {
- perror("FBIOPUT_VSCREENINFO ioctl");
- goto fail;
- }
- }
-
- if (fbdev->fbvar_new.yres_virtual < fbdev->fbvar_old.yres * fbdev->buffer_count) {
- fbdev->fbvar_new.yres_virtual = fbdev->fbvar_old.yres * fbdev->buffer_count;
- ret = ioctl(fbdev->fd, FBIOPUT_VSCREENINFO, &fbdev->fbvar_new);
- if (ret == -1) {
- fbdev->buffer_count = 1;
- fprintf(stderr, "Warning: failed to increase virtual resolution, "
- "doublebuffering disabled\n");
- }
- }
-
- fbdev->mem_size = *w * *h * 2 * fbdev->buffer_count;
- fbdev->mem = mmap(0, fbdev->mem_size, PROT_WRITE|PROT_READ, MAP_SHARED, fbdev->fd, 0);
- if (fbdev->mem == MAP_FAILED && fbdev->buffer_count > 1) {
- fprintf(stderr, "Warning: can't map %zd bytes, doublebuffering disabled\n", fbdev->mem_size);
- fbdev->mem_size = *w * *h * 2;
- fbdev->buffer_count = 1;
- fbdev->mem = mmap(0, fbdev->mem_size, PROT_WRITE|PROT_READ, MAP_SHARED, fbdev->fd, 0);
- }
- if (fbdev->mem == MAP_FAILED) {
- perror("mmap framebuffer");
- goto fail;
- }
- memset(fbdev->mem, 0, fbdev->mem_size);
- for (i = 0; i < fbdev->buffer_count; i++)
- fbdev->buffers[i] = (char *)fbdev->mem + i * *w * *h * 2;
-
- // some checks
- ret = 0;
- ret = ioctl(fbdev->fd, FBIO_WAITFORVSYNC, &ret);
- if (ret != 0)
- fprintf(stderr, "Warning: vsync doesn't seem to be supported\n");
-
- if (fbdev->buffer_count > 1) {
- fbdev->buffer_write = 0;
- fbdev->fbvar_new.yoffset = fbdev->fbvar_old.yres * (fbdev->buffer_count - 1);
- ret = ioctl(fbdev->fd, FBIOPAN_DISPLAY, &fbdev->fbvar_new);
- if (ret != 0) {
- fbdev->buffer_count = 1;
- fprintf(stderr, "Warning: can't pan display, doublebuffering disabled\n");
- }
- }
-
- printf("fbdev initialized.\n");
- return fbdev;
-
-fail:
- close(fbdev->fd);
-fail_open:
- free(fbdev);
- return NULL;
-}
-
-void vout_fbdev_finish(struct vout_fbdev *fbdev)
-{
- ioctl(fbdev->fd, FBIOPUT_VSCREENINFO, &fbdev->fbvar_old);
- if (fbdev->mem != MAP_FAILED)
- munmap(fbdev->mem, fbdev->mem_size);
- if (fbdev->fd >= 0)
- close(fbdev->fd);
- fbdev->mem = NULL;
- fbdev->fd = -1;
- free(fbdev);
-}
-
-#if 0
-void *g_screen_ptr;
-int main()
-{
- int w, h;
- vout_fbdev_init(&w, &h);
- //while (1)
- {
- memset(g_screen_ptr, 0xff, fbdev_mem_size / 2);
- plat_video_wait_vsync();
- plat_video_flip();
- memset(g_screen_ptr, 0x00, fbdev_mem_size / 2);
- usleep(8000);
-// plat_video_wait_vsync();
- plat_video_flip();
- }
-}
-#endif
+++ /dev/null
-struct vout_fbdev;
-
-struct vout_fbdev *vout_fbdev_init(const char *fbdev_name, int *w, int *h, int no_dblbuf);
-void *vout_fbdev_flip(struct vout_fbdev *fbdev);
-void vout_fbdev_wait_vsync(struct vout_fbdev *fbdev);
-void vout_fbdev_clear(struct vout_fbdev *fbdev);
-void vout_fbdev_finish(struct vout_fbdev *fbdev);
#if defined(PND)
-#include "fbdev.c"
+#include "linux/fbdev.c"
static struct vout_fbdev *fbdev;
static unsigned short host_pal[256];
if (fbdev_name == NULL)
fbdev_name = "/dev/fb1";
+ w = h = 0;
fbdev = vout_fbdev_init(fbdev_name, &w, &h, no_dblbuf);
if (fbdev == NULL)
return -1;
#elif defined(WIZ)
-#include "warm.c"
+#include "warm/warm.c"
#include "wiz_video.c"
void *host_video_flip(void)
--- /dev/null
+Subproject commit c682a397f4a09a7e9e29fee12ec5101a4284d452
+++ /dev/null
-/*
- * wARM - exporting ARM processor specific privileged services to userspace
- * userspace part
- *
- * Copyright (c) Gražvydas "notaz" Ignotas, 2009
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the organization nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <sys/utsname.h>
-#include <sys/syscall.h>
-#include <errno.h>
-
-#define WARM_CODE
-#include "warm.h"
-
-#define PFX "wARM: "
-
-/* provided by glibc */
-extern long init_module(void *, unsigned long, const char *);
-extern long delete_module(const char *, unsigned int);
-
-static int warm_fd = -1;
-static int kernel_version;
-static int module_inserted;
-
-static void sys_cacheflush(void *start, void *end)
-{
-#ifdef __ARM_EABI__
- /* EABI version */
- int num = __ARM_NR_cacheflush;
- __asm__("mov r0, %0 ;"
- "mov r1, %1 ;"
- "mov r2, #0 ;"
- "mov r7, %2 ;"
- "swi 0" : : "r" (start), "r" (end), "r" (num)
- : "r0", "r1", "r2", "r3", "r7");
-#else
- /* OABI */
- __asm__("mov r0, %0 ;"
- "mov r1, %1 ;"
- "mov r2, #0 ;"
- "swi %2" : : "r" (start), "r" (end), "i" __ARM_NR_cacheflush
- : "r0", "r1", "r2", "r3");
-#endif
-}
-
-/* Those are here because system() occasionaly fails on Wiz
- * with errno 12 for some unknown reason */
-static int manual_insmod_26(const char *fname, const char *opts)
-{
- unsigned long len, read_len;
- int ret = -1;
- void *buff;
- FILE *f;
-
- f = fopen(fname, "rb");
- if (f == NULL)
- return -1;
-
- fseek(f, 0, SEEK_END);
- len = ftell(f);
- fseek(f, 0, SEEK_SET);
-
- buff = malloc(len);
- if (buff == NULL)
- goto fail0;
-
- read_len = fread(buff, 1, len, f);
- if (read_len != len) {
- fprintf(stderr, PFX "failed to read module\n");
- goto fail1;
- }
-
- ret = init_module(buff, len, opts);
-
-fail1:
- free(buff);
-fail0:
- fclose(f);
- return ret;
-}
-
-static int manual_rmmod(const char *name)
-{
- return delete_module(name, O_NONBLOCK|O_EXCL);
-}
-
-int warm_init(void)
-{
- struct utsname unm;
- char buff1[32], buff2[128];
- int ret;
-
- memset(&unm, 0, sizeof(unm));
- uname(&unm);
-
- if (strlen(unm.release) < 3 || unm.release[1] != '.') {
- fprintf(stderr, PFX "unexpected version string: %s\n", unm.release);
- goto fail;
- }
- kernel_version = ((unm.release[0] - '0') << 4) | (unm.release[2] - '0');
-
- warm_fd = open("/proc/warm", O_RDWR);
- if (warm_fd >= 0)
- return 0;
-
- snprintf(buff1, sizeof(buff1), "warm_%s.%s", unm.release, kernel_version >= 0x26 ? "ko" : "o");
- snprintf(buff2, sizeof(buff2), "/sbin/insmod %s verbose=1", buff1);
-
- /* try to insmod */
- ret = system(buff2);
- if (ret != 0) {
- fprintf(stderr, PFX "system/insmod failed: %d %d\n", ret, errno);
- if (kernel_version >= 0x26) {
- ret = manual_insmod_26(buff1, "verbose=1");
- if (ret != 0)
- fprintf(stderr, PFX "manual insmod also failed: %d\n", ret);
- }
- }
- if (ret == 0)
- module_inserted = 1;
-
- warm_fd = open("/proc/warm", O_RDWR);
- if (warm_fd >= 0)
- return 0;
-
-fail:
- fprintf(stderr, PFX "can't init, acting as sys_cacheflush wrapper\n");
- return -1;
-}
-
-void warm_finish(void)
-{
- char name[32], cmd[64];
- int ret;
-
- if (warm_fd < 0)
- return;
-
- close(warm_fd);
- warm_fd = -1;
-
- if (module_inserted) {
- if (kernel_version < 0x26) {
- struct utsname unm;
- memset(&unm, 0, sizeof(unm));
- uname(&unm);
- snprintf(name, sizeof(name), "warm_%s", unm.release);
- }
- else
- strcpy(name, "warm");
-
- snprintf(cmd, sizeof(cmd), "/sbin/rmmod %s", name);
- ret = system(cmd);
- if (ret != 0) {
- fprintf(stderr, PFX "system/rmmod failed: %d %d\n", ret, errno);
- manual_rmmod(name);
- }
- }
-}
-
-int warm_cache_op_range(int op, void *addr, unsigned long size)
-{
- struct warm_cache_op wop;
- int ret;
-
- if (warm_fd < 0) {
- /* note that this won't work for warm_cache_op_all */
- sys_cacheflush(addr, (char *)addr + size);
- return -1;
- }
-
- wop.ops = op;
- wop.addr = (unsigned long)addr;
- wop.size = size;
-
- ret = ioctl(warm_fd, WARMC_CACHE_OP, &wop);
- if (ret != 0) {
- perror("WARMC_CACHE_OP failed");
- return -1;
- }
-
- return 0;
-}
-
-int warm_cache_op_all(int op)
-{
- return warm_cache_op_range(op, NULL, (unsigned long)-1);
-}
-
-int warm_change_cb_range(int cb, int is_set, void *addr, unsigned long size)
-{
- struct warm_change_cb ccb;
- int ret;
-
- if (warm_fd < 0)
- return -1;
-
- ccb.addr = (unsigned long)addr;
- ccb.size = size;
- ccb.cb = cb;
- ccb.is_set = is_set;
-
- ret = ioctl(warm_fd, WARMC_CHANGE_CB, &ccb);
- if (ret != 0) {
- perror("WARMC_CHANGE_CB failed");
- return -1;
- }
-
- return 0;
-}
-
-int warm_change_cb_upper(int cb, int is_set)
-{
- return warm_change_cb_range(cb, is_set, 0, 0);
-}
-
-unsigned long warm_virt2phys(const void *ptr)
-{
- unsigned long ptrio;
- int ret;
-
- ptrio = (unsigned long)ptr;
- ret = ioctl(warm_fd, WARMC_VIRT2PHYS, &ptrio);
- if (ret != 0) {
- perror("WARMC_VIRT2PHYS failed");
- return (unsigned long)-1;
- }
-
- return ptrio;
-}
-
+++ /dev/null
-/*
- * wARM - exporting ARM processor specific privileged services to userspace
- * library functions
- *
- * Copyright (c) Gražvydas "notaz" Ignotas, 2009
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the organization nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef __WARM_H__
-#define __WARM_H__ 1
-
-/* cache operations (warm_cache_op_*):
- * o clean - write dirty data to memory, but also leave in cache.
- * o invalidate - throw away everything in cache, losing dirty data.
- *
- * Write buffer is always drained, no ops will only drain WB
- */
-#define WOP_D_CLEAN (1 << 0)
-#define WOP_D_INVALIDATE (1 << 1)
-#define WOP_I_INVALIDATE (1 << 2)
-
-/* change C and B bits (warm_change_cb_*)
- * if is_set in not zero, bits are set, else cleared.
- * the address for range function is virtual address.
- */
-#define WCB_C_BIT (1 << 0)
-#define WCB_B_BIT (1 << 1)
-
-#ifndef __ASSEMBLER__
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-int warm_init(void);
-
-int warm_cache_op_range(int ops, void *virt_addr, unsigned long size);
-int warm_cache_op_all(int ops);
-
-int warm_change_cb_upper(int cb, int is_set);
-int warm_change_cb_range(int cb, int is_set, void *virt_addr, unsigned long size);
-
-unsigned long warm_virt2phys(const void *ptr);
-
-void warm_finish(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-/* internal */
-#ifdef WARM_CODE
-
-#include <linux/ioctl.h>
-
-#define WARM_IOCTL_BASE 'A'
-
-struct warm_cache_op
-{
- unsigned long addr;
- unsigned long size;
- int ops;
-};
-
-struct warm_change_cb
-{
- unsigned long addr;
- unsigned long size;
- int cb;
- int is_set; /* set (1) or clear (0) */
-};
-
-#define WARMC_CACHE_OP _IOW(WARM_IOCTL_BASE, 0, struct warm_cache_op)
-#define WARMC_CHANGE_CB _IOW(WARM_IOCTL_BASE, 1, struct warm_change_cb)
-#define WARMC_VIRT2PHYS _IOWR(WARM_IOCTL_BASE, 2, unsigned long)
-
-#endif /* WARM_CODE */
-#endif /* !__ASSEMBLER__ */
-#endif /* __WARM_H__ */
#include <sys/mman.h>
#include <unistd.h>
#include <linux/fb.h>
-#include "warm.h"
+#include "warm/warm.h"
static volatile unsigned short *memregs;
static volatile unsigned int *memregl;
notaz.gp2x.de / ginge.git / commitdiff