name changes

Author: psxdev

eboot_plugin/source/eboot_plugin.c

@@ -28,7 +28,7 @@ void updateController()
 	if(ret==0)
 	{
 
-		if(orbisPadGetButton(SCE_PAD_BUTTON_UP))
+		if(orbisPadGetButton(ORBISPAD_UP))
 		{
 			if(y-step>=0)
 			{
@@ -39,7 +39,7 @@ void updateController()
 				y=0;
 			}
 		}
-		if(orbisPadGetButton(SCE_PAD_BUTTON_DOWN))
+		if(orbisPadGetButton(ORBISPAD_DOWN))
 		{
 			if(y+step<conf->height-1)
 			{
@@ -50,7 +50,7 @@ void updateController()
 				y=conf->height-1-step;
 			}
 		}						
-		if(orbisPadGetButton(SCE_PAD_BUTTON_RIGHT))
+		if(orbisPadGetButton(ORBISPAD_RIGHT))
 		{
 			if(x+step<conf->width-1)
 			{
@@ -61,7 +61,7 @@ void updateController()
 				x=conf->width-1-step;
 			}
 		}
-		if(orbisPadGetButton(SCE_PAD_BUTTON_LEFT))
+		if(orbisPadGetButton(ORBISPAD_LEFT))
 		{
 			if(x-step>=0)
 			{
@@ -72,21 +72,21 @@ void updateController()
 				x=0;
 			}
 		}
-		if(orbisPadGetButton(SCE_PAD_BUTTON_TRIANGLE))
+		if(orbisPadGetButton(ORBISPAD_TRIANGLE))
 		{
 			sys_log("Triangle pressed exit\n");
 
 			flag=0;
 
 		}
-		if(orbisPadGetButton(SCE_PAD_BUTTON_CIRCLE))
+		if(orbisPadGetButton(ORBISPAD_CIRCLE))
 		{
 			sys_log("Circle pressed reset position and color red\n");
 			x=1280/2;
 			y=720/2;
 			color=0x80ff0000;	
 		}
-		if(orbisPadGetButton(SCE_PAD_BUTTON_CROSS))
+		if(orbisPadGetButton(ORBISPAD_CROSS))
 		{
 			sys_log("Cross pressed rand color\n");
 			R=rand()%256;
@@ -95,7 +95,7 @@ void updateController()
 			color=0x80000000|R<<16|G<<8|B;
 
 		}
-		if(orbisPadGetButton(SCE_PAD_BUTTON_SQUARE))
+		if(orbisPadGetButton(ORBISPAD_SQUARE))
 		{
 			sys_log("Square pressed\n");
 

liborbis2d/include/orbis2d.h

@@ -5,8 +5,12 @@
 
 
 #define ORBIS2D_DISPLAY_BUFFER_NUM 2 
-#define ORBIS2D_FLIP_RATE 0 // 0 none 1 30fps 2 20fps
-#define ORBIS2D_FLIP_MODE SCE_VIDEO_OUT_FLIP_MODE_VSYNC 
+#define ORBIS2D_FLIP_RATE 0 
+#define ORBIS2D_FLIP_MODE_VSYNC 1
+#define ORBIS2D_FLIP_MODE_HSYNC 2
+#define ORBIS2D_FLIP_MODE_WINDOW 3
+#define ORBIS2D_MODE_TILE 0
+#define ORBIS2D_MODE_LINEAR 1
 
 
 #define ATTR_WIDTH 1280 

liborbis2d/source/orbis2d.c

@@ -2,10 +2,14 @@
 #include <stdlib.h>
 #include <sys/param.h>
 #include <kernel.h>
+#include <types/event.h>
+
+
 #include <gnmdriver.h>
 #include <systemservice.h>
 #include <videoout.h>
 #include <types/userservice.h>
+
 #include "orbis2d.h"
 #include "logdebug.h"
 
@@ -53,10 +57,10 @@ int orbis2dCreateConf()
 		orbconf->width=ATTR_WIDTH;
 		orbconf->pitch=ATTR_WIDTH;
 		orbconf->height=ATTR_HEIGHT;
-		orbconf->pixelFormat=SCE_VIDEO_OUT_PIXEL_FORMAT_A8R8G8B8_SRGB;
+		orbconf->pixelFormat=0x80000000;
 		orbconf->bytesPerPixel=4;
-		orbconf->tilingMode=SCE_VIDEO_OUT_TILING_MODE_LINEAR;
-		orbconf->flipMode=ORBIS2D_FLIP_MODE;
+		orbconf->tilingMode=ORBIS2D_MODE_LINEAR;
+		orbconf->flipMode=ORBIS2D_FLIP_MODE_VSYNC;
 		orbconf->flipRate=ORBIS2D_FLIP_RATE;
 		orbconf->videoHandle=-1;
 		orbconf->currentBuffer=0;
@@ -160,7 +164,7 @@ void orbis2dStartDrawing()
 	orbis2dWaitFlipArg(&orbconf->flipQueue);
 
 }
-void orbis2dWritePixelColor(int x, int y, uint32_t pixelColor)
+void orbis2dDrawPixelColor(int x, int y, uint32_t pixelColor)
 {
 	int color;
 	int pixel = (y * orbconf->pitch) + x;
@@ -178,7 +182,7 @@ void orbis2dDrawRectColor(int x, int w, int y, int h, uint32_t color)
 	{
 		for(x0=x;x0<x+w;x0++) 
 		{
-			orbis2dWritePixelColor(x0,y0,color);
+			orbis2dDrawPixelColor(x0,y0,color);
 		}
 	}
 }
@@ -223,7 +227,7 @@ int orbis2dInitDisplayBuffer(int num, int bufIndexStart)
 {
 	SceVideoOutBufferAttribute attr;
 	int ret;
-	sceVideoOutSetBufferAttribute(&attr,orbconf->pixelFormat,orbconf->tilingMode,SCE_VIDEO_OUT_ASPECT_RATIO_16_9,orbconf->width,orbconf->height,orbconf->pitch);
+	sceVideoOutSetBufferAttribute(&attr,orbconf->pixelFormat,orbconf->tilingMode,0,orbconf->width,orbconf->height,orbconf->pitch);
 
 	sys_log("liborbis2d sceVideoOutSetBufferAttribute done\n");
 
@@ -240,15 +244,15 @@ int orbis2dInitMemory()
 
 	const uint32_t align=2*1024*1024;
 
-	ret=sceKernelAllocateDirectMemory(0,sceKernelGetDirectMemorySize(),orbconf->videoMemStackSize,align,SCE_KERNEL_WC_GARLIC,&start);
+	ret=sceKernelAllocateDirectMemory(0,sceKernelGetDirectMemorySize(),orbconf->videoMemStackSize,align,3,&start);
 	if(ret==0)
 	{
 
 		orbconf->videoMemOffset=start;
 
 		void* pointer=NULL;
 
-		ret=sceKernelMapDirectMemory(&pointer,orbconf->videoMemStackSize,SCE_KERNEL_PROT_CPU_READ|SCE_KERNEL_PROT_CPU_WRITE|SCE_KERNEL_PROT_GPU_READ|SCE_KERNEL_PROT_GPU_ALL,0,start,align);
+		ret=sceKernelMapDirectMemory(&pointer,orbconf->videoMemStackSize,0x33,0,start,align);
 		if(ret==0)
 		{
 			orbconf->videoMemStackBaseAddr=(uintptr_t)pointer;
@@ -264,7 +268,7 @@ int orbis2dInitVideoHandle()
 	int handle;
 	int ret;
 
-	handle=sceVideoOutOpen(SCE_USER_SERVICE_USER_ID_SYSTEM, SCE_VIDEO_OUT_BUS_TYPE_MAIN, 0, NULL);
+	handle=sceVideoOutOpen(0xff, 0, 0, NULL);
 
 	if(handle<0)
 	{
@@ -343,7 +347,7 @@ int orbis2dInit()
 			// set status of each buffer with flipArg
 			for(bufIndex=0;bufIndex<ORBIS2D_DISPLAY_BUFFER_NUM;bufIndex++) 
 			{
-				orbconf->flipArgLog[bufIndex]= SCE_VIDEO_OUT_BUFFER_INITIAL_FLIP_ARG-1; 
+				orbconf->flipArgLog[bufIndex]= -2; 
 			}
 
 			// prepare initial clear color to the display buffers

liborbisPad/include/orbisPad.h

@@ -5,6 +5,27 @@
 #include <types/userservice.h>
 #include <types/pad.h>
 
+
+
+#define	ORBISPAD_L3		0x00000002
+#define	ORBISPAD_R3		0x00000004
+#define	ORBISPAD_OPTIONS	0x00000008
+#define	ORBISPAD_UP		0x00000010
+#define	ORBISPAD_RIGHT		0x00000020
+#define	ORBISPAD_DOWN		0x00000040
+#define	ORBISPAD_LEFT		0x00000080
+#define	ORBISPAD_L2		0x00000100
+#define	ORBISPAD_R2		0x00000200
+#define	ORBISPAD_L1		0x00000400
+#define	ORBISPAD_R1		0x00000800
+#define	ORBISPAD_TRIANGLE	0x00001000
+#define	ORBISPAD_CIRCLE		0x00002000
+#define	ORBISPAD_CROSS		0x00004000
+#define	ORBISPAD_SQUARE		0x00008000
+#define	ORBISPAD_TOUCH_PAD	0x00100000
+#define	ORBISPAD_INTERCEPTED	0x80000000
+
+
 typedef struct OrbisPadConfig
 {
 	SceUserServiceUserId userId;