Skip to content

Commit 4085934

Browse files
authored
Merge pull request #869 from uyjulian/chksyscall_getgsdxdyoffset
Use GetSyscallHandler to check if _GetGsDxDyOffset exists
2 parents 857bc85 + 93f826a commit 4085934

2 files changed

Lines changed: 2 additions & 26 deletions

File tree

ee/libgs/src/draw.c

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include <sys/unistd.h>
1616
#include <kernel.h>
1717
#include <libgs.h>
18+
#include <syscallnr.h>
1819

1920
#include "internal.h"
2021

@@ -49,30 +50,6 @@ void GsSetDefaultDrawEnvAddress(GS_DRAWENV *drawenv, u16 vram_addr)
4950
drawenv->vram_addr=vram_addr;
5051
}
5152

52-
int checkModelVersion(void)
53-
{
54-
int fd, result;
55-
char data[256];
56-
57-
if((fd=open("rom0:ROMVER", O_RDONLY))>=0)
58-
{
59-
int i;
60-
char *pData;
61-
for(pData=data,i=0; (unsigned int)i<sizeof(data); i++)
62-
{
63-
read(fd, pData, 1);
64-
if(*pData++=='\0') break;
65-
}
66-
close(fd);
67-
68-
//ROMVER string format: VVVVRTYYYYMMDD\n
69-
result=(20010608<atoi(data+i-9));
70-
}
71-
else result=-1;
72-
73-
return result;
74-
}
75-
7653
void GsSetDefaultDisplayEnv(GS_DISPENV *dispenv, u16 psm, u16 w, u16 h, u16 dx, u16 dy)
7754
{
7855
GsGParam_t *pGParams;
@@ -88,7 +65,7 @@ void GsSetDefaultDisplayEnv(GS_DISPENV *dispenv, u16 psm, u16 w, u16 h, u16 dx,
8865
gs_DY=0;
8966
gs_DX=0;
9067
} else {
91-
if(checkModelVersion())
68+
if(GetSyscallHandler(__NR__GetGsDxDyOffset))
9269
_GetGsDxDyOffset(pGParams->omode, &gs_DX, &gs_DY, &gs_DW, &gs_DH);
9370
else{
9471
gs_DH=0;

ee/libgs/src/internal.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
extern int checkModelVersion(void);
21

32
//DMA management
43
extern void GsDmaInit(void);

0 commit comments

Comments
 (0)