From 1a5475ee87b87da7bab3a78705044e2af25407a5 Mon Sep 17 00:00:00 2001
From: Sergi Granell
Date: Wed, 8 Feb 2017 16:11:24 +0100
Subject: Update psp2/usbd.h (#128)

Add some SceUsbdForDriver NIDs
Add initial psp2kern/usbd.h---
 include/kernel/usbd.h | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 include/user/usbd.h   | 25 +++++++++++++++++++------
 nids/360/SceUsbd.yml  |  6 +++++-
 3 files changed, 74 insertions(+), 7 deletions(-)
 create mode 100644 include/kernel/usbd.h

diff --git a/include/kernel/usbd.h b/include/kernel/usbd.h
new file mode 100644
index 0000000..7e75fbc
--- /dev/null
+++ b/include/kernel/usbd.h
@@ -0,0 +1,50 @@
+#ifndef _PSP2_KERNEL_USBD_H_
+#define _PSP2_KERNEL_USBD_H_
+
+#include <psp2kern/kernel/threadmgr.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define SCE_USBD_ERROR_ACCESS 0x80240003
+#define SCE_USBD_ERROR_BUSY 0x80240006
+#define SCE_USBD_ERROR_FATAL 0x802400ff
+#define SCE_USBD_ERROR_INTERRUPTED 0x8024000a
+#define SCE_USBD_ERROR_INVALID_ARG 0x80240002
+#define SCE_USBD_ERROR_IO 0x80240001
+#define SCE_USBD_ERROR_NO_DEVICE 0x80240004
+#define SCE_USBD_ERROR_NO_MEM 0x8024000b
+#define SCE_USBD_ERROR_NOT_FOUND 0x80240005
+#define SCE_USBD_ERROR_NOT_SUPPORTED 0x8024000c
+#define SCE_USBD_ERROR_OVERFLOW 0x80240008
+#define SCE_USBD_ERROR_PIPE 0x80240009
+#define SCE_USBD_ERROR_TIMEOUT 0x80240007
+
+typedef struct SceUsbdDeviceInfo {
+	unsigned int unk0;
+	unsigned int unk1;
+	unsigned int unk2;
+} SceUsbdDeviceInfo; /* size = 0xC */
+
+typedef struct SceUsbdDeviceAddress {
+	unsigned int unk0;
+	unsigned short unk1;
+} SceUsbdDeviceAddress; /* size = 0x6 */
+
+typedef struct SceUsbdDriver {
+	const char *name;
+	int (*func_unk0)(int);
+	int (*func_unk1)(int);
+	int (*func_unk2)(int);
+	SceUsbdDriver *next;
+} SceUsbdDriver; /* size = 0x14 */
+
+int sceUsbdRegisterDriver(SceUsbdDriver *driver);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _PSP2_KERNEL_USBD_H_ */
diff --git a/include/user/usbd.h b/include/user/usbd.h
index 97e78fb..8c80a16 100644
--- a/include/user/usbd.h
+++ b/include/user/usbd.h
@@ -1,6 +1,8 @@
 #ifndef _PSP2_USBD_H_
 #define _PSP2_USBD_H_
 
+#include <psp2/kernel/threadmgr.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -19,8 +21,19 @@ extern "C" {
 #define SCE_USBD_ERROR_PIPE 0x80240009
 #define SCE_USBD_ERROR_TIMEOUT 0x80240007
 
-int sceUsbdInit(int *);
-int sceUsbdEnd();
+typedef struct SceUsbdDeviceInfo {
+	unsigned int unk0;
+	unsigned int unk1;
+	unsigned int unk2;
+} SceUsbdDeviceInfo; /* size = 0xC */
+
+typedef struct SceUsbdDeviceAddress {
+	unsigned int unk0;
+	unsigned short unk1;
+} SceUsbdDeviceAddress; /* size = 0x6 */
+
+int sceUsbdInit(SceUID *uid);
+int sceUsbdEnd(SceUID uid);
 
 int sceUsbdRegisterCallback(SceUID cbid, int);
 int sceUsbdUnregisterCallback(SceUID cbid);
@@ -32,10 +45,10 @@ int sceUsbdOpenDefaultPipe();
 int sceUsbdOpenPipe();
 int sceUsbdClosePipe();
 
-int sceUsbdGetDeviceList();
-int sceUsbdGetDescriptor();
-int sceUsbdGetDescriptorSize();
-int sceUsbdGetDeviceLocation();
+int sceUsbdGetDeviceList(SceUID uid, unsigned int num, SceUsbdDeviceInfo *info);
+int sceUsbdGetDescriptor(SceUID uid, unsigned int descriptor_id, void *descriptor, unsigned int size);
+int sceUsbdGetDescriptorSize(SceUID uid, unsigned int descriptor_id);
+int sceUsbdGetDeviceAddress(SceUID uid, int, SceUsbdDeviceAddress *addr);
 int sceUsbdGetDeviceSpeed();
 int sceUsbdGetTransferStatus();
 int sceUsbdGetIsochTransferStatus();
diff --git a/nids/360/SceUsbd.yml b/nids/360/SceUsbd.yml
index f0a4fdc..2212bd9 100644
--- a/nids/360/SceUsbd.yml
+++ b/nids/360/SceUsbd.yml
@@ -2,6 +2,10 @@ modules:
   SceUsbd:
     nid: 0x3525FE7A
     libraries:
+      SceUsbdForDriver:
+        nid: 0xA0EBCA41
+        functions:
+          sceUsbdRegisterDriver: 0x1EC94F18
       SceUsbdForUser:
         nid: 0xC3AEAB67
         functions:
@@ -11,8 +15,8 @@ modules:
           sceUsbdEnd: 0x5736A150
           sceUsbdGetDescriptor: 0xAE671F22
           sceUsbdGetDescriptorSize: 0xB357AC81
+          sceUsbdGetDeviceAddress: 0xC54F9D11
           sceUsbdGetDeviceList: 0x2DE0239E
-          sceUsbdGetDeviceLocation: 0xC54F9D11
           sceUsbdGetDeviceSpeed: 0x6C5AACD0
           sceUsbdGetIsochTransferStatus: 0xA0A2C826
           sceUsbdGetTransferStatus: 0xCDF5B6E0
-- 
cgit v1.2.3