notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
frontend: split 4:3 scaling options
[pcsx_rearmed.git]
/
frontend
/
plugin.c
diff --git
a/frontend/plugin.c
b/frontend/plugin.c
index
6c83a44
..
fa4cf21
100644
(file)
--- a/
frontend/plugin.c
+++ b/
frontend/plugin.c
@@
-43,15
+43,21
@@
extern void SPUplayCDDAchannel(short *, int);
/* PAD */
static long PADreadPort1(PadDataS *pad)
{
/* PAD */
static long PADreadPort1(PadDataS *pad)
{
- pad->controllerType = PSE_PAD_TYPE_STANDARD;
- pad->buttonStatus = ~keystate;
+ pad->controllerType = in_type1;
+ pad->buttonStatus = ~in_keystate;
+ if (in_type1 == PSE_PAD_TYPE_ANALOGPAD) {
+ pad->leftJoyX = in_a1[0];
+ pad->leftJoyY = in_a1[1];
+ pad->rightJoyX = in_a2[0];
+ pad->rightJoyY = in_a2[1];
+ }
return 0;
}
static long PADreadPort2(PadDataS *pad)
{
return 0;
}
static long PADreadPort2(PadDataS *pad)
{
- pad->controllerType =
PSE_PAD_TYPE_STANDARD
;
- pad->buttonStatus = ~keystate >> 16;
+ pad->controllerType =
in_type2
;
+ pad->buttonStatus = ~
in_
keystate >> 16;
return 0;
}
return 0;
}
@@
-68,17
+74,9
@@
extern uint32_t GPUreadData(void);
extern void GPUreadDataMem(uint32_t *, int);
extern long GPUdmaChain(uint32_t *,uint32_t);
extern void GPUupdateLace(void);
extern void GPUreadDataMem(uint32_t *, int);
extern long GPUdmaChain(uint32_t *,uint32_t);
extern void GPUupdateLace(void);
-extern long GPUconfigure(void);
-extern long GPUtest(void);
-extern void GPUabout(void);
-extern void GPUmakeSnapshot(void);
-extern void GPUkeypressed(int);
-extern void GPUdisplayText(char *);
extern long GPUfreeze(uint32_t, void *);
extern long GPUfreeze(uint32_t, void *);
-extern long GPUgetScreenPic(unsigned char *);
-extern long GPUshowScreenPic(unsigned char *);
-extern void GPUclearDynarec(void (*callback)(void));
-extern void GPUvBlank(int);
+extern void GPUvBlank(int, uint32_t *);
+extern void GPUrearmedCallbacks(const struct rearmed_cbs *cbs);
#define DUMMY(id, name) \
#define DUMMY(id, name) \
@@
-87,6
+85,7
@@
extern void GPUvBlank(int);
#define DIRECT(id, name) \
{ id, #name, name }
#define DIRECT(id, name) \
{ id, #name, name }
+#define DUMMY_GPU(name) DUMMY(PLUGIN_GPU, name)
#define DUMMY_CDR(name) DUMMY(PLUGIN_CDR, name)
#define DUMMY_PAD(name) DUMMY(PLUGIN_PAD, name)
#define DIRECT_SPU(name) DIRECT(PLUGIN_SPU, name)
#define DUMMY_CDR(name) DUMMY(PLUGIN_CDR, name)
#define DUMMY_PAD(name) DUMMY(PLUGIN_PAD, name)
#define DIRECT_SPU(name) DIRECT(PLUGIN_SPU, name)
@@
-159,9
+158,6
@@
static const struct {
DIRECT_GPU(GPUupdateLace),
DIRECT_GPU(GPUinit),
DIRECT_GPU(GPUshutdown),
DIRECT_GPU(GPUupdateLace),
DIRECT_GPU(GPUinit),
DIRECT_GPU(GPUshutdown),
- DIRECT_GPU(GPUconfigure),
- DIRECT_GPU(GPUtest),
- DIRECT_GPU(GPUabout),
DIRECT_GPU(GPUopen),
DIRECT_GPU(GPUclose),
DIRECT_GPU(GPUreadStatus),
DIRECT_GPU(GPUopen),
DIRECT_GPU(GPUclose),
DIRECT_GPU(GPUreadStatus),
@@
-171,14
+167,21
@@
static const struct {
DIRECT_GPU(GPUwriteData),
DIRECT_GPU(GPUwriteDataMem),
DIRECT_GPU(GPUdmaChain),
DIRECT_GPU(GPUwriteData),
DIRECT_GPU(GPUwriteDataMem),
DIRECT_GPU(GPUdmaChain),
+ DIRECT_GPU(GPUfreeze),
+ DIRECT_GPU(GPUvBlank),
+ DIRECT_GPU(GPUrearmedCallbacks),
+
+ DUMMY_GPU(GPUdisplayText),
+/*
DIRECT_GPU(GPUkeypressed),
DIRECT_GPU(GPUkeypressed),
- DIRECT_GPU(GPUdisplayText),
DIRECT_GPU(GPUmakeSnapshot),
DIRECT_GPU(GPUmakeSnapshot),
- DIRECT_GPU(GPUfreeze),
+ DIRECT_GPU(GPUconfigure),
+ DIRECT_GPU(GPUtest),
+ DIRECT_GPU(GPUabout),
DIRECT_GPU(GPUgetScreenPic),
DIRECT_GPU(GPUshowScreenPic),
DIRECT_GPU(GPUgetScreenPic),
DIRECT_GPU(GPUshowScreenPic),
+*/
// DIRECT_GPU(GPUclearDynarec),
// DIRECT_GPU(GPUclearDynarec),
-// DIRECT_GPU(GPUvBlank),
};
void *plugin_link(enum builtint_plugins_e id, const char *sym)
};
void *plugin_link(enum builtint_plugins_e id, const char *sym)
@@
-268,8
+271,7
@@
pc_hook_func (SPU_playCDDAchannel, (short *a0, int a1), (a0, a1), P
void pcnt_hook_plugins(void)
{
void pcnt_hook_plugins(void)
{
- /* test it first */
- pcnt_get();
+ pcnt_init();
hook_it(GPU_writeStatus);
hook_it(GPU_writeData);
hook_it(GPU_writeStatus);
hook_it(GPU_writeData);