External/pspsdk
1
0
Fork 0
mirror of https://github.com/pspdev/pspsdk.git synced 2026-09-19 22:05:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Merge pull request #386 from Ryp/headers/binding-friendly-declarations

Browse Source 
Improve headers consistency
This commit is contained in:
Eric Shimizu Karbstein
2026-09-17 18:34:56 -03:00
committed by GitHub
parent 168c9eddf5 1675572020
commit 654ac51fc7
12 changed files with 161 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gu/guInternal.h
View File

@@ -18,8 +18,6 @@
#define GU_OBJECT_STACK_SIZE 32
typedef void (*GuCallback)(int);
typedef struct
{
GuCallback sig;

8
src/gu/pspgu.h
View File

@@ -346,7 +346,11 @@ extern "C" {
/* Color Macro, maps floating point channels (0..1) into one 32-bit value */
#define GU_COLOR(r,g,b,a) GU_RGBA((u32)((r) * 255.0f),(u32)((g) * 255.0f),(u32)((b) * 255.0f),(u32)((a) * 255.0f))
typedef void (*GuSwapBuffersCallback)(void** display,void** render);
/** Callback for signal and finish events */
typedef void (*GuCallback)(int id);
/** Callback for the framebuffer swap */
typedef void (*GuSwapBuffersCallback)(void** display, void** render);
/** @addtogroup GU */
/**@{*/
@@ -513,7 +517,7 @@ int sceGuContinue(void);
* @param callback - Callback to call when signal index is triggered
* @return The old callback handler
**/
void* sceGuSetCallback(int signal, void (*callback)(int));
void* sceGuSetCallback(int signal, GuCallback callback);
/**
* Trigger signal to call code from the command stream

101
src/kernel/pspimpose_driver.h
View File

@@ -12,6 +12,8 @@
#ifndef __IMPOSE_DRIVER_H__
#define __IMPOSE_DRIVER_H__
#include <pspimpose.h>
#ifdef __cplusplus
extern "C" {
#endif
@@ -19,23 +21,19 @@ extern "C" {
typedef int SceImposeParam;
/**
* These values have been found in the 3.52 kernel.
* These values have been found in the 3.52 kernel.
* Therefore, they might not be supported by previous ones.
*/
#define PSP_IMPOSE_MAIN_VOLUME 0x1
#define PSP_IMPOSE_BACKLIGHT_BRIGHTNESS 0x2
#define PSP_IMPOSE_EQUALIZER_MODE 0x4
#define PSP_IMPOSE_MUTE 0x8
#define PSP_IMPOSE_AVLS 0x10
#define PSP_IMPOSE_TIME_FORMAT 0x20
#define PSP_IMPOSE_DATE_FORMAT 0x40
#define PSP_IMPOSE_LANGUAGE 0x80
#define PSP_IMPOSE_BACKLIGHT_OFF_INTERVAL 0x200
#define PSP_IMPOSE_SOUND_REDUCTION 0x400
#define PSP_IMPOSE_UMD_POPUP_ENABLED 1
#define PSP_IMPOSE_UMD_POPUP_DISABLED 0
#define PSP_IMPOSE_MAIN_VOLUME 0x1
#define PSP_IMPOSE_BACKLIGHT_BRIGHTNESS 0x2
#define PSP_IMPOSE_EQUALIZER_MODE 0x4
#define PSP_IMPOSE_MUTE 0x8
#define PSP_IMPOSE_AVLS 0x10
#define PSP_IMPOSE_TIME_FORMAT 0x20
#define PSP_IMPOSE_DATE_FORMAT 0x40
#define PSP_IMPOSE_LANGUAGE 0x80
#define PSP_IMPOSE_BACKLIGHT_OFF_INTERVAL 0x200
#define PSP_IMPOSE_SOUND_REDUCTION 0x400
/**
* Fetch the value of an Impose parameter.
@@ -54,77 +52,6 @@ int sceImposeGetParam(SceImposeParam param);
*/
int sceImposeSetParam(SceImposeParam param, int value);
/**
* Get the value of the backlight timer.
*
* @return backlight timer in seconds or < 0 on error
*
*/
int sceImposeGetBacklightOffTime(void);
/**
* Set the value of the backlight timer.
*
* @param value - The backlight timer. (30 to a lot of seconds)
* @return < 0 on error
*
*/
int sceImposeSetBacklightOffTime(int value);
/**
* Get the language and button assignment parameters
*
* @return < 0 on error
*
*/
int sceImposeGetLanguageMode(int* lang, int* button);
/**
* Set the language and button assignment parameters
*
* /!\ parameter values not known.
*
* @param lang - Language
* @param button - Button assignment
* @return < 0 on error
*
*/
int sceImposeSetLanguageMode(int lang, int button);
/**
* Get the value of the UMD popup.
*
* @return umd popup state or < 0 on error
*
*/
int sceImposeGetUMDPopup(void);
/**
* Set the value of the UMD popup.
*
* @param value - The popup mode.
* @return < 0 on error
*
*/
int sceImposeSetUMDPopup(int value);
/**
* Get the value of the Home popup.
*
* @return home popup state or < 0 on error
*
*/
int sceImposeGetHomePopup(void);
/**
* Set the value of the Home popup.
*
* @param value - The popup mode.
* @return < 0 on error
*
*/
int sceImposeSetHomePopup(int value);
/**
* Check the video out. (for psp slim?)
*
@@ -132,7 +59,7 @@ int sceImposeSetHomePopup(int value);
* @return < 0 on error
*
*/
int sceImposeCheckVideoOut(int* value);
int sceImposeCheckVideoOut(int *value);
#ifdef __cplusplus
}

2
src/kernel/psploadexec_kernel.h
View File

@@ -58,7 +58,7 @@ typedef struct SceKernelLoadExecVSHParam {
*
* @return < 0 on some errors.
*/
int sceKernelLoadExecBufferPlain(SceSize bufsize, void *buf, struct SceKernelLoadExecParam *param);
int sceKernelLoadExecBufferPlain(SceSize bufsize, void *buf, SceKernelLoadExecParam *param);
#endif
/**

24
src/net/pspnet_adhocctl.h
View File

@@ -30,7 +30,7 @@ struct productStruct
};
/** Peer info structure */
struct SceNetAdhocctlPeerInfo
typedef struct SceNetAdhocctlPeerInfo
{
struct SceNetAdhocctlPeerInfo *next;
/** Nickname */
@@ -41,10 +41,10 @@ struct SceNetAdhocctlPeerInfo
unsigned char unknown[6];
/** Time stamp */
unsigned long timestamp;
};
} SceNetAdhocctlPeerInfo;
/** Scan info structure */
struct SceNetAdhocctlScanInfo
typedef struct SceNetAdhocctlScanInfo
{
struct SceNetAdhocctlScanInfo *next;
/** Channel number */
@@ -57,18 +57,18 @@ struct SceNetAdhocctlScanInfo
unsigned char unknown[2];
/** Unknown */
int unknown2;
};
} SceNetAdhocctlScanInfo;
struct SceNetAdhocctlGameModeInfo
typedef struct SceNetAdhocctlGameModeInfo
{
/** Number of peers (including self) */
int count;
/** MAC addresses of peers (including self) */
unsigned char macs[16][6];
};
} SceNetAdhocctlGameModeInfo;
/** Params structure */
struct SceNetAdhocctlParams
typedef struct SceNetAdhocctlParams
{
/** Channel number */
int channel;
@@ -78,7 +78,7 @@ struct SceNetAdhocctlParams
char nickname[128];
/** The BSSID */
unsigned char bssid[6];
};
} SceNetAdhocctlParams;
/**
* Initialise the Adhoc control library
@@ -139,7 +139,7 @@ int sceNetAdhocctlCreate(const char *name);
*
* @return 0 on success, < 0 on error.
*/
int sceNetAdhocctlJoin(struct SceNetAdhocctlScanInfo *scaninfo);
int sceNetAdhocctlJoin(SceNetAdhocctlScanInfo *scaninfo);
/**
* Get the adhoc ID
@@ -183,7 +183,7 @@ int sceNetAdhocctlJoinEnterGameMode(const char *name, unsigned char *hostmac, un
*
* @return 0 on success, < 0 on error.
*/
int sceNetAdhocctlGetGameModeInfo(struct SceNetAdhocctlGameModeInfo *gamemodeinfo);
int sceNetAdhocctlGetGameModeInfo(SceNetAdhocctlGameModeInfo *gamemodeinfo);
/**
* Exit game mode.
@@ -211,7 +211,7 @@ int sceNetAdhocctlGetPeerList(int *length, void *buf);
*
* @return 0 on success, < 0 on error.
*/
int sceNetAdhocctlGetPeerInfo(unsigned char *mac, int size, struct SceNetAdhocctlPeerInfo *peerinfo);
int sceNetAdhocctlGetPeerInfo(unsigned char *mac, int size, SceNetAdhocctlPeerInfo *peerinfo);
/**
* Scan the adhoc channels
@@ -279,7 +279,7 @@ int sceNetAdhocctlGetAddrByName(char *nickname, int *length, void *buf);
*
* @return 0 on success, < 0 on error.
*/
int sceNetAdhocctlGetParameter(struct SceNetAdhocctlParams *params);
int sceNetAdhocctlGetParameter(SceNetAdhocctlParams *params);
#ifdef __cplusplus
}

6
src/net/pspnet_apctl.h
View File

@@ -63,7 +63,7 @@ extern "C" {
#define PSP_NET_APCTL_INFO_SECURITY_TYPE_WEP 1
#define PSP_NET_APCTL_INFO_SECURITY_TYPE_WPA 2
union SceNetApctlInfo
typedef union SceNetApctlInfo
{
char name[64]; /* Name of the config used */
unsigned char bssid[6]; /* MAC address of the access point */
@@ -85,7 +85,7 @@ union SceNetApctlInfo
unsigned int startBrowser; /* Should browser be started */
unsigned int wifisp; /* 1 if connection is for Wifi service providers (WISP) */
};
} SceNetApctlInfo;
typedef void (*sceNetApctlHandler)(int oldState, int newState, int event, int error, void *pArg);
@@ -116,7 +116,7 @@ int sceNetApctlTerm(void);
*
* @return < 0 on error.
*/
int sceNetApctlGetInfo(int code, union SceNetApctlInfo *pInfo);
int sceNetApctlGetInfo(int code, SceNetApctlInfo *pInfo);
/**
* Add an apctl event handler.

14
src/net/pspnet_inet.h
View File

@@ -36,22 +36,22 @@ extern "C" {
* This struct is needed because tv_sec size is different from what newlib expect
* Newlib expects 64bits for seconds and PSP expects 32bits
*/
struct SceNetInetTimeval {
typedef struct SceNetInetTimeval {
uint32_t tv_sec;
uint32_t tv_usec;
};
} SceNetInetTimeval;
struct SceNetInetPollfd {
typedef struct SceNetInetPollfd {
/* file descriptor */
int fd;
/* requested events */
short events;
/* returned events */
short revents;
};
} SceNetInetPollfd;
int sceNetInetInit(void);
int sceNetInetSelect(int n, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct SceNetInetTimeval *timeout);
int sceNetInetSelect(int n, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, SceNetInetTimeval *timeout);
int sceNetInetTerm(void);
int sceNetInetGetErrno(void);
int sceNetInetAccept(int s, struct sockaddr *addr, socklen_t *addrlen);
@@ -60,7 +60,7 @@ int sceNetInetConnect(int s, const struct sockaddr *serv_addr, socklen_t addrlen
int sceNetInetGetsockopt(int s, int level, int optname, void *optval, socklen_t *optlen);
int sceNetInetListen(int s, int backlog);
size_t sceNetInetRecv(int s, void *buf, size_t len, int flags);
size_t sceNetInetRecvfrom(int s, void *buf, size_t flags, int, struct sockaddr *from, socklen_t *fromlen);
size_t sceNetInetRecvfrom(int s, void *buf, size_t len, int flags, struct sockaddr *from, socklen_t *fromlen);
size_t sceNetInetSend(int s, const void *buf, size_t len, int flags);
size_t sceNetInetSendto(int s, const void *buf, size_t len, int flags, const struct sockaddr *to, socklen_t tolen);
int sceNetInetSetsockopt(int s, int level, int optname, const void *optval, socklen_t optlen);
@@ -72,7 +72,7 @@ int sceNetInetGetpeername(int s, struct sockaddr *name, socklen_t *namelen);
int sceNetInetGetsockname(int s, struct sockaddr *name, socklen_t *namelen);
ssize_t sceNetInetSendmsg(int s, const struct msghdr *msg, int flags);
ssize_t sceNetInetRecvmsg(int s, struct msghdr *msg, int flags);
int sceNetInetPoll(struct SceNetInetPollfd *fds, size_t nfds, int timeout);
int sceNetInetPoll(SceNetInetPollfd *fds, size_t nfds, int timeout);
#ifdef __cplusplus
}

1
src/user/Makefile.am
View File

@@ -37,6 +37,7 @@ AUDIOROUTING_OBJS = sceAudioRouting_0000.o sceAudioRouting_0001.o sceAudioRoutin
libpspuserincludedir = @PSPSDK_INCLUDEDIR@
libpspuserinclude_HEADERS = \
pspaudiorouting.h \
pspimpose.h \
pspiofilemgr.h \
pspiofilemgr_devctl.h \
pspiofilemgr_dirent.h \

97
src/user/pspimpose.h Normal file
View File

@@ -0,0 +1,97 @@
/*
* PSP Software Development Kit - https://github.com/pspdev
* -----------------------------------------------------------------------
* Licensed under the BSD license, see LICENSE in PSPSDK root for details.
*
* pspimpose.h - Prototypes for the sceImpose library.
*
* Copyright (c) 2007 Iaroslav Gaponenko <adrahil@gmail.com>
*
*/
#ifndef __IMPOSE_H__
#define __IMPOSE_H__
#ifdef __cplusplus
extern "C" {
#endif
#define PSP_IMPOSE_UMD_POPUP_ENABLED 1
#define PSP_IMPOSE_UMD_POPUP_DISABLED 0
/**
* Get the value of the backlight timer.
*
* @return backlight timer in seconds or < 0 on error
*
*/
int sceImposeGetBacklightOffTime(void);
/**
* Set the value of the backlight timer.
*
* @param value - The backlight timer. (30 to a lot of seconds)
* @return < 0 on error
*
*/
int sceImposeSetBacklightOffTime(int value);
/**
* Get the language and button assignment parameters
*
* @return < 0 on error
*
*/
int sceImposeGetLanguageMode(int *lang, int *button);
/**
* Set the language and button assignment parameters
*
* /!\ parameter values not known.
*
* @param lang - Language
* @param button - Button assignment
* @return < 0 on error
*
*/
int sceImposeSetLanguageMode(int lang, int button);
/**
* Get the value of the UMD popup.
*
* @return umd popup state or < 0 on error
*
*/
int sceImposeGetUMDPopup(void);
/**
* Set the value of the UMD popup.
*
* @param value - The popup mode.
* @return < 0 on error
*
*/
int sceImposeSetUMDPopup(int value);
/**
* Get the value of the Home popup.
*
* @return home popup state or < 0 on error
*
*/
int sceImposeGetHomePopup(void);
/**
* Set the value of the Home popup.
*
* @param value - The popup mode.
* @return < 0 on error
*
*/
int sceImposeSetHomePopup(int value);
#ifdef __cplusplus
}
#endif
#endif

6
src/user/psploadexec.h
View File

@@ -58,7 +58,7 @@ int sceKernelRegisterExitCallback(int cbid);
void sceKernelExitGame(void);
/** Structure to pass to loadexec */
struct SceKernelLoadExecParam {
typedef struct SceKernelLoadExecParam {
/** Size of the structure */
SceSize size;
/** Size of the arg string */
@@ -67,7 +67,7 @@ struct SceKernelLoadExecParam {
void * argp;
/** Encryption key ? */
const char * key;
};
} SceKernelLoadExecParam;
/**
* Execute a new game executable, limited when not running in kernel mode.
@@ -78,7 +78,7 @@ struct SceKernelLoadExecParam {
* @return < 0 on error, probably.
*
*/
int sceKernelLoadExec(const char *file, struct SceKernelLoadExecParam *param);
int sceKernelLoadExec(const char *file, SceKernelLoadExecParam *param);
#ifdef __cplusplus
}

32
src/user/pspthreadman.h
View File

@@ -1120,7 +1120,7 @@ int sceKernelCheckCallback(void);
/* Misc. */
/** Threadman types for ::sceKernelGetThreadmanIdList */
enum SceKernelIdListType
typedef enum SceKernelIdListType
{
SCE_KERNEL_TMID_Thread = 1,
SCE_KERNEL_TMID_Semaphore = 2,
@@ -1137,7 +1137,7 @@ enum SceKernelIdListType
SCE_KERNEL_TMID_DelayThread = 65,
SCE_KERNEL_TMID_SuspendThread = 66,
SCE_KERNEL_TMID_DormantThread = 67,
};
} SceKernelIdListType;
/**
* Get a list of UIDs from threadman. Allows you to enumerate
@@ -1150,7 +1150,7 @@ enum SceKernelIdListType
*
* @return < 0 on error. Either 0 or the same as idcount on success.
*/
int sceKernelGetThreadmanIdList(enum SceKernelIdListType type, SceUID *readbuf, int readbufsize, int *idcount);
int sceKernelGetThreadmanIdList(SceKernelIdListType type, SceUID *readbuf, int readbufsize, int *idcount);
/** Structure to contain the system status returned by ::sceKernelReferSystemStatus */
typedef struct SceKernelSystemStatus {
@@ -1316,9 +1316,9 @@ int sceKernelReferMsgPipeStatus(SceUID uid, SceKernelMppInfo *info);
/* VPL Functions */
struct SceKernelVplOptParam {
typedef struct SceKernelVplOptParam {
SceSize size;
};
} SceKernelVplOptParam;
/**
* Create a variable pool
@@ -1331,7 +1331,7 @@ struct SceKernelVplOptParam {
*
* @return The UID of the created pool, < 0 on error.
*/
SceUID sceKernelCreateVpl(const char *name, int part, int attr, unsigned int size, struct SceKernelVplOptParam *opt);
SceUID sceKernelCreateVpl(const char *name, int part, int attr, unsigned int size, SceKernelVplOptParam *opt);
/**
* Delete a variable pool
@@ -1419,9 +1419,9 @@ int sceKernelReferVplStatus(SceUID uid, SceKernelVplInfo *info);
/* FPL Functions */
struct SceKernelFplOptParam {
typedef struct SceKernelFplOptParam {
SceSize size;
};
} SceKernelFplOptParam;
/**
* Create a fixed pool
@@ -1435,7 +1435,7 @@ struct SceKernelFplOptParam {
*
* @return The UID of the created pool, < 0 on error.
*/
int sceKernelCreateFpl(const char *name, int part, int attr, unsigned int size, unsigned int blocks, struct SceKernelFplOptParam *opt);
int sceKernelCreateFpl(const char *name, int part, int attr, unsigned int size, unsigned int blocks, SceKernelFplOptParam *opt);
/**
* Delete a fixed pool
@@ -1594,9 +1594,9 @@ SceInt64 sceKernelGetSystemTimeWide(void);
*/
unsigned int sceKernelGetSystemTimeLow(void);
struct SceKernelVTimerOptParam {
typedef struct SceKernelVTimerOptParam {
SceSize size;
};
} SceKernelVTimerOptParam;
/**
* Create a virtual timer
@@ -1606,7 +1606,7 @@ struct SceKernelVTimerOptParam {
*
* @return The VTimer's UID or < 0 on error.
*/
SceUID sceKernelCreateVTimer(const char *name, struct SceKernelVTimerOptParam *opt);
SceUID sceKernelCreateVTimer(const char *name, SceKernelVTimerOptParam *opt);
/**
* Delete a virtual timer
@@ -1693,8 +1693,8 @@ int sceKernelStartVTimer(SceUID uid);
*/
int sceKernelStopVTimer(SceUID uid);
typedef SceUInt (*SceKernelVTimerHandler)(SceUID uid, SceKernelSysClock *, SceKernelSysClock *, void *);
typedef SceUInt (*SceKernelVTimerHandlerWide)(SceUID uid, SceInt64, SceInt64, void *);
typedef SceUInt (*SceKernelVTimerHandler)(SceUID uid, SceKernelSysClock *schedule, SceKernelSysClock *current, void *common);
typedef SceUInt (*SceKernelVTimerHandlerWide)(SceUID uid, SceInt64 schedule, SceInt64 current, void *common);
/**
* Set the timer handler
@@ -1763,7 +1763,7 @@ void _sceKernelExitThread(void);
*
* @return The type, < 0 on error
*/
enum SceKernelIdListType sceKernelGetThreadmanIdType(SceUID uid);
SceKernelIdListType sceKernelGetThreadmanIdType(SceUID uid);
typedef int (*SceKernelThreadEventHandler)(int mask, SceUID thid, void *common);
@@ -1823,7 +1823,7 @@ int sceKernelReleaseThreadEventHandler(SceUID uid);
*
* @return 0 on success, < 0 on error
*/
int sceKernelReferThreadEventHandlerStatus(SceUID uid, struct SceKernelThreadEventHandlerInfo *info);
int sceKernelReferThreadEventHandlerStatus(SceUID uid, SceKernelThreadEventHandlerInfo *info);
/**
* Get the thread profiler registers.

2
src/user/psputils.h
View File

@@ -55,7 +55,7 @@ clock_t sceKernelLibcClock(void);
/**
* Get the current time of time and time zone information
*/
int sceKernelLibcGettimeofday(struct SceKernelTimeval *tp, struct timezone *tzp);
int sceKernelLibcGettimeofday(SceKernelTimeval *tp, struct timezone *tzp);
/**
* Write back the data cache to memory