Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

begin kernel renaming. #99

Merged
merged 5 commits into from
Dec 17, 2016
Merged

begin kernel renaming. #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a309515
begin kernel renaming.
DaveeFTW Nov 20, 2016
fdd6056
Merge master into kernel_scheme
devnoname120 Dec 16, 2016
2357ada
Finish ksce renaming
devnoname120 Dec 16, 2016
40ea6f3
Remove remaining ForDriver suffixes in headers
devnoname120 Dec 16, 2016
f767e12
Remove k-prefix for Kernel libc and debug
devnoname120 Dec 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
328 changes: 164 additions & 164 deletions db.yml
View file
Open in desktop

Large diffs are not rendered by default.

92 changes: 46 additions & 46 deletions include/psp2kern/bt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,52 +281,52 @@ typedef struct _SceBtHidRequest {
struct _SceBtHidRequest *next;
} __attribute__((packed)) SceBtHidRequest; /* size = 0x18 */

int sceBtAvrcpReadVolumeForDriver(int r0, int r1, int r2, int r3);
int sceBtAvrcpSendButtonForDriver(int r0, int r1, int r2, int r3);
int sceBtAvrcpSendVolumeForDriver(int r0, int r1, int r2, int r3);
int sceBtAvrcpSetPlayStatusForDriver(int r0, int r1, int r2, int r3);
int sceBtAvrcpSetTitleForDriver(int r0, int r1, int r2, int r3);
int sceBtDeleteRegisteredInfoForDriver(int r0, int r1, int r2, int r3);
int sceBtFreqAudioForDriver(int r0, int r1, int r2, int r3);
int sceBtGetConfigurationForDriver(void); // returns 0x0 BT disabled, 0x9 if enabled
int sceBtGetConnectingInfoForDriver(unsigned int mac0, unsigned int mac1); // 1 = disconnected?, 2 = connecting?, 5 = connected?
int sceBtGetDeviceNameForDriver(unsigned int mac0, unsigned int mac1, char name[0x79]);
int sceBtGetInfoForTestForDriver(int r0, int r1, int r2, int r3);
int sceBtGetLastErrorForDriver(void);
int sceBtGetRegisteredInfoForDriver(int device, int unk, SceBtRegisteredInfo *info, unsigned int info_size);
int sceBtGetStatusForTestForDriver(int r0, int r1, int r2, int r3);
int sceBtGetVidPidForDriver(unsigned int mac0, unsigned int mac1, unsigned short vid_pid[2]);
int sceBtHfpGetCurrentPhoneNumberForDriver(int r0, int r1, int r2, int r3);
int sceBtHfpRequestForDriver(int r0, int r1, int r2, int r3);
int sceBtHidGetReportDescriptorForDriver(unsigned int mac0, unsigned int mac1, void *buffer, unsigned int size);
int sceBtHidTransferForDriver(unsigned int mac0, unsigned int mac1, SceBtHidRequest *request);
int sceBtPairingOOBForDriver(int r0, int r1, int r2, int r3);
int sceBtPushBipForDriver(int r0, int r1, int r2, int r3);
int sceBtPushOppForDriver(int r0, int r1, int r2, int r3);
int sceBtReadEventForDriver(SceBtEvent *events, int num_events);
int sceBtRecvAudioForDriver(int r0, int r1, int r2, int r3);
int sceBtRecvBipForDriver(int r0, int r1, int r2, int r3);
int sceBtRecvOppForDriver(int r0, int r1, int r2, int r3);
int sceBtRecvSppForDriver(int r0, int r1, int r2, int r3);
int sceBtRegisterCallbackForDriver(SceUID cb, int unused, int flags1, int flags2); // looks like flags1 is a mask for permitted MACs
int sceBtReplyPinCodeForDriver(unsigned int mac0, unsigned int mac1, unsigned char *code, unsigned int length);
int sceBtReplyUserConfirmationForDriver(unsigned int mac0, unsigned int mac1, int unk);
int sceBtSendAudioForDriver(int r0, int r1, int r2, int r3);
int sceBtSendL2capEchoRequestForTestForDriver(int r0, int r1, int r2, int r3);
int sceBtSendSppForDriver(int r0, int r1, int r2, int r3);
int sceBtSetConfigurationForDriver(int r0); //0 = disable bt, 1 = enabling, 2 = enabled 3 = disabling?
int sceBtSetContentProtectionForDriver(int r0);
int sceBtSetInquiryResultForTestForDriver(unsigned char *);
int sceBtSetInquiryScanForDriver(int r0);
int sceBtSetL2capEchoResponseBufferForTestForDriver(int r0, int r1, int r2, int r3);
int sceBtSetStatusForTestForDriver(int r0, int r1, int r2, int r3);
int sceBtStartAudioForDriver(int r0, int r1, int r2, int r3);
int sceBtStartConnectForDriver(unsigned int mac0, unsigned int mac1); // mac0 can be used as a device index (already paired devices)?
int sceBtStartDisconnectForDriver(unsigned int mac0, unsigned int mac1);
int sceBtStartInquiryForDriver(void);
int sceBtStopAudioForDriver(int r0, int r1, int r2, int r3);
int sceBtStopInquiryForDriver(void);
int sceBtUnregisterCallbackForDriver(SceUID cb);
int ksceBtAvrcpReadVolume(int r0, int r1, int r2, int r3);
int ksceBtAvrcpSendButton(int r0, int r1, int r2, int r3);
int ksceBtAvrcpSendVolume(int r0, int r1, int r2, int r3);
int ksceBtAvrcpSetPlayStatus(int r0, int r1, int r2, int r3);
int ksceBtAvrcpSetTitle(int r0, int r1, int r2, int r3);
int ksceBtDeleteRegisteredInfo(int r0, int r1, int r2, int r3);
int ksceBtFreqAudio(int r0, int r1, int r2, int r3);
int ksceBtGetConfiguration(void); // returns 0x0 BT disabled, 0x9 if enabled
int ksceBtGetConnectingInfo(unsigned int mac0, unsigned int mac1); // 1 = disconnected?, 2 = connecting?, 5 = connected?
int ksceBtGetDeviceName(unsigned int mac0, unsigned int mac1, char name[0x79]);
int ksceBtGetInfoForTest(int r0, int r1, int r2, int r3);
int ksceBtGetLastError(void);
int ksceBtGetRegisteredInfo(int device, int unk, SceBtRegisteredInfo *info, unsigned int info_size);
int ksceBtGetStatusForTest(int r0, int r1, int r2, int r3);
int ksceBtGetVidPid(unsigned int mac0, unsigned int mac1, unsigned short vid_pid[2]);
int ksceBtHfpGetCurrentPhoneNumber(int r0, int r1, int r2, int r3);
int ksceBtHfpRequest(int r0, int r1, int r2, int r3);
int ksceBtHidGetReportDescriptor(unsigned int mac0, unsigned int mac1, void *buffer, unsigned int size);
int ksceBtHidTransfer(unsigned int mac0, unsigned int mac1, SceBtHidRequest *request);
int ksceBtPairingOOB(int r0, int r1, int r2, int r3);
int ksceBtPushBip(int r0, int r1, int r2, int r3);
int ksceBtPushOpp(int r0, int r1, int r2, int r3);
int ksceBtReadEvent(SceBtEvent *events, int num_events);
int ksceBtRecvAudio(int r0, int r1, int r2, int r3);
int ksceBtRecvBip(int r0, int r1, int r2, int r3);
int ksceBtRecvOpp(int r0, int r1, int r2, int r3);
int ksceBtRecvSpp(int r0, int r1, int r2, int r3);
int ksceBtRegisterCallback(SceUID cb, int unused, int flags1, int flags2); // looks like flags1 is a mask for permitted MACs
int ksceBtReplyPinCode(unsigned int mac0, unsigned int mac1, unsigned char *code, unsigned int length);
int ksceBtReplyUserConfirmation(unsigned int mac0, unsigned int mac1, int unk);
int ksceBtSendAudio(int r0, int r1, int r2, int r3);
int ksceBtSendL2capEchoRequestForTest(int r0, int r1, int r2, int r3);
int ksceBtSendSpp(int r0, int r1, int r2, int r3);
int ksceBtSetConfiguration(int r0); //0 = disable bt, 1 = enabling, 2 = enabled 3 = disabling?
int ksceBtSetContentProtection(int r0);
int ksceBtSetInquiryResultForTest(unsigned char *);
int ksceBtSetInquiryScan(int r0);
int ksceBtSetL2capEchoResponseBufferForTest(int r0, int r1, int r2, int r3);
int ksceBtSetStatusForTest(int r0, int r1, int r2, int r3);
int ksceBtStartAudio(int r0, int r1, int r2, int r3);
int ksceBtStartConnect(unsigned int mac0, unsigned int mac1); // mac0 can be used as a device index (already paired devices)?
int ksceBtStartDisconnect(unsigned int mac0, unsigned int mac1);
int ksceBtStartInquiry(void);
int ksceBtStopAudio(int r0, int r1, int r2, int r3);
int ksceBtStopInquiry(void);
int ksceBtUnregisterCallback(SceUID cb);

#ifdef __cplusplus
}
Expand Down
68 changes: 34 additions & 34 deletions include/psp2kern/io/fcntl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
extern "C" {
#endif

/* Note: Not all of these sceIoOpen() flags are not compatible with the
/* Note: Not all of these ksceIoOpen() flags are not compatible with the
open() flags found in sys/unistd.h. */
enum {
SCE_O_RDONLY = 0x0001,
Expand All @@ -49,13 +49,13 @@ enum {
*
* @par Example1: Open a file for reading
* @code
* if(!(fd = sceIoOpen("device:/path/to/file", SCE_O_RDONLY, 0777)) {
* if(!(fd = ksceIoOpen("device:/path/to/file", SCE_O_RDONLY, 0777)) {
* // error
* }
* @endcode
* @par Example2: Open a file for writing, creating it if it doesnt exist
* @code
* if(!(fd = sceIoOpen("device:/path/to/file", SCE_O_WRONLY|SCE_O_CREAT, 0777)) {
* if(!(fd = ksceIoOpen("device:/path/to/file", SCE_O_WRONLY|SCE_O_CREAT, 0777)) {
* // error
* }
* @endcode
Expand All @@ -65,7 +65,7 @@ enum {
* @param mode - File access mode.
* @return A non-negative integer is a valid fd, anything else an error
*/
SceUID sceIoOpenForDriver(const char *file, int flags, SceMode mode);
SceUID ksceIoOpen(const char *file, int flags, SceMode mode);

/**
* Open or create a file for reading or writing (asynchronous)
Expand All @@ -75,34 +75,34 @@ SceUID sceIoOpenForDriver(const char *file, int flags, SceMode mode);
* @param mode - File access mode.
* @return A non-negative integer is a valid fd, anything else an error
*/
SceUID sceIoOpenAsyncForDriver(const char *file, int flags, SceMode mode);
SceUID ksceIoOpenAsync(const char *file, int flags, SceMode mode);

/**
* Delete a descriptor
*
* @code
* sceIoClose(fd);
* ksceIoClose(fd);
* @endcode
*
* @param fd - File descriptor to close
* @return < 0 on error
*/
int sceIoCloseForDriver(SceUID fd);
int ksceIoClose(SceUID fd);

/**
* Delete a descriptor (asynchronous)
*
* @param fd - File descriptor to close
* @return < 0 on error
*/
int sceIoCloseAsyncForDriver(SceUID fd);
int ksceIoCloseAsync(SceUID fd);

/**
* Read input
*
* @par Example:
* @code
* bytes_read = sceIoRead(fd, data, 100);
* bytes_read = ksceIoRead(fd, data, 100);
* @endcode
*
* @param fd - Opened file descriptor to read from
Expand All @@ -111,14 +111,14 @@ int sceIoCloseAsyncForDriver(SceUID fd);
*
* @return The number of bytes read
*/
int sceIoReadForDriver(SceUID fd, void *data, SceSize size);
int ksceIoRead(SceUID fd, void *data, SceSize size);

/**
* Read input (asynchronous)
*
* @par Example:
* @code
* bytes_read = sceIoRead(fd, data, 100);
* bytes_read = ksceIoRead(fd, data, 100);
* @endcode
*
* @param fd - Opened file descriptor to read from
Expand All @@ -127,14 +127,14 @@ int sceIoReadForDriver(SceUID fd, void *data, SceSize size);
*
* @return < 0 on error.
*/
int sceIoReadAsyncForDriver(SceUID fd, void *data, SceSize size);
int ksceIoReadAsync(SceUID fd, void *data, SceSize size);

/**
* Write output
*
* @par Example:
* @code
* bytes_written = sceIoWrite(fd, data, 100);
* bytes_written = ksceIoWrite(fd, data, 100);
* @endcode
*
* @param fd - Opened file descriptor to write to
Expand All @@ -143,7 +143,7 @@ int sceIoReadAsyncForDriver(SceUID fd, void *data, SceSize size);
*
* @return The number of bytes written
*/
int sceIoWriteForDriver(SceUID fd, const void *data, SceSize size);
int ksceIoWrite(SceUID fd, const void *data, SceSize size);

/**
* Write output (asynchronous)
Expand All @@ -154,14 +154,14 @@ int sceIoWriteForDriver(SceUID fd, const void *data, SceSize size);
*
* @return < 0 on error.
*/
int sceIoWriteAsyncForDriver(SceUID fd, const void *data, SceSize size);
int ksceIoWriteAsync(SceUID fd, const void *data, SceSize size);

/**
* Reposition read/write file descriptor offset
*
* @par Example:
* @code
* pos = sceIoLseek(fd, -10, SEEK_END);
* pos = ksceIoLseek(fd, -10, SEEK_END);
* @endcode
*
* @param fd - Opened file descriptor with which to seek
Expand All @@ -171,7 +171,7 @@ int sceIoWriteAsyncForDriver(SceUID fd, const void *data, SceSize size);
*
* @return The position in the file after the seek.
*/
SceOff sceIoLseekForDriver(SceUID fd, SceOff offset, int whence);
SceOff ksceIoLseek(SceUID fd, SceOff offset, int whence);

/**
* Reposition read/write file descriptor offset (asynchronous)
Expand All @@ -181,16 +181,16 @@ SceOff sceIoLseekForDriver(SceUID fd, SceOff offset, int whence);
* @param whence - Set to SEEK_SET to seek from the start of the file, SEEK_CUR
* seek from the current position and SEEK_END to seek from the end.
*
* @return < 0 on error. Actual value should be passed returned by the ::sceIoWaitAsync call.
* @return < 0 on error. Actual value should be passed returned by the ::ksceIoWaitAsync call.
*/
int sceIoLseekAsyncForDriver(SceUID fd, SceOff offset, int whence);
int ksceIoLseekAsync(SceUID fd, SceOff offset, int whence);

/**
* Reposition read/write file descriptor offset (32bit mode)
*
* @par Example:
* @code
* pos = sceIoLseek32(fd, -10, SEEK_END);
* pos = ksceIoLseek32(fd, -10, SEEK_END);
* @endcode
*
* @param fd - Opened file descriptor with which to seek
Expand All @@ -200,7 +200,7 @@ int sceIoLseekAsyncForDriver(SceUID fd, SceOff offset, int whence);
*
* @return The position in the file after the seek.
*/
int sceIoLseek32ForDriver(SceUID fd, int offset, int whence);
int ksceIoLseek32(SceUID fd, int offset, int whence);

/**
* Reposition read/write file descriptor offset (32bit mode, asynchronous)
Expand All @@ -212,15 +212,15 @@ int sceIoLseek32ForDriver(SceUID fd, int offset, int whence);
*
* @return < 0 on error.
*/
int sceIoLseek32AsyncForDriver(SceUID fd, int offset, int whence);
int ksceIoLseek32Async(SceUID fd, int offset, int whence);

/**
* Remove directory entry
*
* @param file - Path to the file to remove
* @return < 0 on error
*/
int sceIoRemoveForDriver(const char *file);
int ksceIoRemove(const char *file);

/**
* Change the name of a file
Expand All @@ -229,15 +229,15 @@ int sceIoRemoveForDriver(const char *file);
* @param newname - The new filename
* @return < 0 on error.
*/
int sceIoRenameForDriver(const char *oldname, const char *newname);
int ksceIoRename(const char *oldname, const char *newname);

/**
* Synchronise the file data on the device.
*
* @param device - The device to synchronise (e.g. msfat0:)
* @param unk - Unknown
*/
int sceIoSyncForDriver(const char *device, unsigned int unk);
int ksceIoSync(const char *device, unsigned int unk);

/**
* Synchronize the file data for one file
Expand All @@ -246,7 +246,7 @@ int sceIoSyncForDriver(const char *device, unsigned int unk);
*
* @return < 0 on error.
*/
int sceIoSyncByFdForDriver(SceUID fd);
int ksceIoSyncByFd(SceUID fd);

/**
* Wait for asyncronous completion.
Expand All @@ -256,7 +256,7 @@ int sceIoSyncByFdForDriver(SceUID fd);
*
* @return < 0 on error.
*/
int sceIoWaitAsyncForDriver(SceUID fd, SceInt64 *res);
int ksceIoWaitAsync(SceUID fd, SceInt64 *res);

/**
* Wait for asyncronous completion (with callbacks).
Expand All @@ -266,7 +266,7 @@ int sceIoWaitAsyncForDriver(SceUID fd, SceInt64 *res);
*
* @return < 0 on error.
*/
int sceIoWaitAsyncCBForDriver(SceUID fd, SceInt64 *res);
int ksceIoWaitAsyncCB(SceUID fd, SceInt64 *res);

/**
* Poll for asyncronous completion.
Expand All @@ -276,7 +276,7 @@ int sceIoWaitAsyncCBForDriver(SceUID fd, SceInt64 *res);
*
* @return < 0 on error.
*/
int sceIoPollAsyncForDriver(SceUID fd, SceInt64 *res);
int ksceIoPollAsync(SceUID fd, SceInt64 *res);

/**
* Get the asyncronous completion status.
Expand All @@ -287,7 +287,7 @@ int sceIoPollAsyncForDriver(SceUID fd, SceInt64 *res);
*
* @return < 0 on error.
*/
int sceIoGetAsyncStatForDriver(SceUID fd, int poll, SceInt64 *res);
int ksceIoGetAsyncStat(SceUID fd, int poll, SceInt64 *res);

/**
* Cancel an asynchronous operation on a file descriptor.
Expand All @@ -296,7 +296,7 @@ int sceIoGetAsyncStatForDriver(SceUID fd, int poll, SceInt64 *res);
*
* @return < 0 on error.
*/
int sceIoCancelForDriver(SceUID fd);
int ksceIoCancel(SceUID fd);

/**
* Get the device type of the currently opened file descriptor.
Expand All @@ -305,7 +305,7 @@ int sceIoCancelForDriver(SceUID fd);
*
* @return < 0 on error. Otherwise the device type?
*/
int sceIoGetDevTypeForDriver(SceUID fd);
int ksceIoGetDevType(SceUID fd);

/**
* Change the priority of the asynchronous thread.
Expand All @@ -315,7 +315,7 @@ int sceIoGetDevTypeForDriver(SceUID fd);
*
* @return < 0 on error.
*/
int sceIoChangeAsyncPriorityForDriver(SceUID fd, int pri);
int ksceIoChangeAsyncPriority(SceUID fd, int pri);

/**
* Sets a callback for the asynchronous action.
Expand All @@ -326,7 +326,7 @@ int sceIoChangeAsyncPriorityForDriver(SceUID fd, int pri);
*
* @return < 0 on error.
*/
int sceIoSetAsyncCallbackForDriver(SceUID fd, SceUID cb, void *argp);
int ksceIoSetAsyncCallback(SceUID fd, SceUID cb, void *argp);

#ifdef __cplusplus
}
Expand Down
Loading