diff options
Diffstat (limited to '')
27 files changed, 25 insertions, 52 deletions
diff --git a/include/kernel/appmgr.h b/include/kernel/appmgr.h index 8bec551..15617f6 100644 --- a/include/kernel/appmgr.h +++ b/include/kernel/appmgr.h @@ -1,7 +1,7 @@ #ifndef _PSP2_KERNEL_APPMGR_H_ #define _PSP2_KERNEL_APPMGR_H_ -#include <psp2common/appmgr.h> +#include_next <appmgr.h> #ifdef __cplusplus extern "C" { diff --git a/include/kernel/bt.h b/include/kernel/bt.h index a95a2e3..41c83b0 100644 --- a/include/kernel/bt.h +++ b/include/kernel/bt.h @@ -1,7 +1,8 @@ #ifndef _PSP2_KERNEL_BT_H_ #define _PSP2_KERNEL_BT_H_ -#include <psp2kern/types.h> +#include <stdint.h> +#include <scetypes.h> #ifdef __cplusplus extern "C" { diff --git a/include/kernel/display.h b/include/kernel/display.h index d8d92f0..0bd75d6 100644 --- a/include/kernel/display.h +++ b/include/kernel/display.h @@ -1,7 +1,8 @@ #ifndef _PSP2_KERNEL_DISPLAY_H_ #define _PSP2_KERNEL_DISPLAY_H_ -#include <psp2kern/types.h> +#include <stdint.h> +#include <scetypes.h> #ifdef __cplusplus extern "C" { diff --git a/include/kernel/fios2.h b/include/kernel/fios2.h index 6c9c15e..1f9edb2 100644 --- a/include/kernel/fios2.h +++ b/include/kernel/fios2.h @@ -1,7 +1,8 @@ #ifndef _PSP2_KERNEL_FIOS2KERNEL_H_ #define _PSP2_KERNEL_FIOS2KERNEL_H_ -#include <psp2kern/types.h> +#include <stdint.h> +#include <scetypes.h> #ifdef __cplusplus extern "C" { diff --git a/include/kernel/idstorage.h b/include/kernel/idstorage.h index 5c98e66..2946526 100644 --- a/include/kernel/idstorage.h +++ b/include/kernel/idstorage.h @@ -1,7 +1,7 @@ #ifndef _PSP2_KERNEL_IDSTORAGE_H_ #define _PSP2_KERNEL_IDSTORAGE_H_ -#include <psp2kern/types.h> +#include <scetypes.h> #ifdef __cplusplus extern "C" { diff --git a/include/kernel/kernel/intrmgr.h b/include/kernel/kernel/intrmgr.h index 91c6337..f0d7a44 100644 --- a/include/kernel/kernel/intrmgr.h +++ b/include/kernel/kernel/intrmgr.h @@ -1,7 +1,7 @@ #ifndef _PSP2_KERNEL_INTRMGR_H_ #define _PSP2_KERNEL_INTRMGR_H_ -#include <psp2kern/types.h> +#include <stdint.h> #ifdef __cplusplus extern "C" { diff --git a/include/kernel/kernel/iofilemgr.h b/include/kernel/kernel/iofilemgr.h index 771dd3d..f656ad5 100644 --- a/include/kernel/kernel/iofilemgr.h +++ b/include/kernel/kernel/iofilemgr.h @@ -3,8 +3,6 @@ #include_next <kernel/iofilemgr.h> -#include <kernel/iofilemgr_async.h> - #ifdef __cplusplus extern "C" { #endif diff --git a/include/kernel/kernel/proc_event.h b/include/kernel/kernel/proc_event.h index 37af5f9..58b6b04 100644 --- a/include/kernel/kernel/proc_event.h +++ b/include/kernel/kernel/proc_event.h @@ -1,7 +1,7 @@ #ifndef _PSP2_KERNEL_PROC_EVENT_H_ #define _PSP2_KERNEL_PROC_EVENT_H_ -#include <psp2kern/types.h> +#include <scetypes.h> #ifdef __cplusplus extern "C" { diff --git a/include/kernel/kernel/processmgr.h b/include/kernel/kernel/processmgr.h index 0452235..d292b24 100644 --- a/include/kernel/kernel/processmgr.h +++ b/include/kernel/kernel/processmgr.h @@ -3,6 +3,8 @@ #include_next <kernel/processmgr.h> +#include <stdint.h> + #ifdef __cplusplus extern "C" { #endif diff --git a/include/kernel/kernel/suspend.h b/include/kernel/kernel/suspend.h index a1429c9..9a4d78a 100644 --- a/include/kernel/kernel/suspend.h +++ b/include/kernel/kernel/suspend.h @@ -1,26 +1,12 @@ #ifndef _PSP2_KERNEL_SUSPEND_H_ #define _PSP2_KERNEL_SUSPEND_H_ -#include <psp2kern/types.h> - #ifdef __cplusplus extern "C" { #endif typedef int (* SceSysEventHandler)(int resume, int eventid, void *args, void *opt); -typedef enum SceKernelPowerTickType { - /** Cancel all timers */ - SCE_KERNEL_POWER_TICK_DEFAULT = 0, - /** Cancel automatic suspension timer */ - SCE_KERNEL_POWER_TICK_DISABLE_AUTO_SUSPEND = 1, - /** Cancel OLED-off timer */ - SCE_KERNEL_POWER_TICK_DISABLE_OLED_OFF = 4, - /** Cancel OLED dimming timer */ - SCE_KERNEL_POWER_TICK_DISABLE_OLED_DIMMING = 6 -} SceKernelPowerTickType; - - /** * Cancel specified idle timers to prevent entering in power save processing. * diff --git a/include/kernel/kernel/sysclib.h b/include/kernel/kernel/sysclib.h index 6efdb81..c80b2f1 100644 --- a/include/kernel/kernel/sysclib.h +++ b/include/kernel/kernel/sysclib.h @@ -1,7 +1,7 @@ #ifndef _DOLCESDK_PSP2KERN_KERNEL_SYSCLIB_H_ #define _DOLCESDK_PSP2KERN_KERNEL_SYSCLIB_H_ -#include <psp2/types.h> +#include <stddef.h> #ifdef __cplusplus extern "C" { diff --git a/include/kernel/kernel/threadmgr.h b/include/kernel/kernel/threadmgr.h index 47fc6a3..7902188 100644 --- a/include/kernel/kernel/threadmgr.h +++ b/include/kernel/kernel/threadmgr.h @@ -3,6 +3,8 @@ #include_next <kernel/threadmgr.h> +#include <stdint.h> + #ifdef __cplusplus extern "C" { #endif diff --git a/include/kernel/kernel/utils.h b/include/kernel/kernel/utils.h index fc1e6f5..438097d 100644 --- a/include/kernel/kernel/utils.h +++ b/include/kernel/kernel/utils.h @@ -1,7 +1,8 @@ #ifndef _PSP2_KERNEL_UTILS_H_ #define _PSP2_KERNEL_UTILS_H_ -#include <psp2kern/types.h> +#include <stdint.h> +#include <scetypes.h> #ifdef __cplusplus extern "C" { diff --git a/include/kernel/lowio/dsi.h b/include/kernel/lowio/dsi.h index 4400a68..68f3d57 100644 --- a/include/kernel/lowio/dsi.h +++ b/include/kernel/lowio/dsi.h @@ -1,8 +1,6 @@ #ifndef _PSP2_KERN_LOWIO_DSI_H_ #define _PSP2_KERN_LOWIO_DSI_H_ -#include <psp2kern/types.h> - #ifdef __cplusplus extern "C" { #endif diff --git a/include/kernel/lowio/gpio.h b/include/kernel/lowio/gpio.h index 5705ddf..7149d1e 100644 --- a/include/kernel/lowio/gpio.h +++ b/include/kernel/lowio/gpio.h @@ -1,8 +1,6 @@ #ifndef _PSP2_KERN_LOWIO_GPIO_H_ #define _PSP2_KERN_LOWIO_GPIO_H_ -#include <psp2kern/types.h> - #ifdef __cplusplus extern "C" { #endif diff --git a/include/kernel/lowio/i2c.h b/include/kernel/lowio/i2c.h index 4ca3178..3776169 100644 --- a/include/kernel/lowio/i2c.h +++ b/include/kernel/lowio/i2c.h @@ -1,8 +1,6 @@ #ifndef _PSP2_KERN_LOWIO_I2C_H_ #define _PSP2_KERN_LOWIO_I2C_H_ -#include <psp2kern/types.h> - #ifdef __cplusplus extern "C" { #endif diff --git a/include/kernel/lowio/iftu.h b/include/kernel/lowio/iftu.h index 9580219..27efd9f 100644 --- a/include/kernel/lowio/iftu.h +++ b/include/kernel/lowio/iftu.h @@ -1,8 +1,6 @@ #ifndef _PSP2_KERN_LOWIO_IFTU_H_ #define _PSP2_KERN_LOWIO_IFTU_H_ -#include <psp2kern/types.h> - #ifdef __cplusplus extern "C" { #endif diff --git a/include/kernel/lowio/pervasive.h b/include/kernel/lowio/pervasive.h index 51bb72b..8103157 100644 --- a/include/kernel/lowio/pervasive.h +++ b/include/kernel/lowio/pervasive.h @@ -1,8 +1,6 @@ #ifndef _PSP2_KERN_LOWIO_PERVASIVE_H_ #define _PSP2_KERN_LOWIO_PERVASIVE_H_ -#include <psp2kern/types.h> - #ifdef __cplusplus extern "C" { #endif diff --git a/include/kernel/power.h b/include/kernel/power.h index ed1bf7e..d10207b 100644 --- a/include/kernel/power.h +++ b/include/kernel/power.h @@ -1,7 +1,7 @@ #ifndef _PSP2_KERN_POWER_H_ #define _PSP2_KERN_POWER_H_ -#include <psp2kern/types.h> +#include <scetypes.h> #ifdef __cplusplus extern "C" { diff --git a/include/kernel/registrymgr.h b/include/kernel/registrymgr.h index 166fc3d..2a5ae9a 100644 --- a/include/kernel/registrymgr.h +++ b/include/kernel/registrymgr.h @@ -1,7 +1,7 @@ #ifndef _PSP2_REGISTRYMGR_H_ #define _PSP2_REGISTRYMGR_H_ -#include <psp2kern/types.h> +#include <scetypes.h> #ifdef __cplusplus extern "C" { diff --git a/include/kernel/sblacmgr.h b/include/kernel/sblacmgr.h index 04a182c..df7be6c 100644 --- a/include/kernel/sblacmgr.h +++ b/include/kernel/sblacmgr.h @@ -1,7 +1,7 @@ #ifndef _PSP2_KERNEL_SBLACMGR_H_ #define _PSP2_KERNEL_SBLACMGR_H_ -#include <psp2kern/types.h> +#include <scetypes.h> #ifdef __cplusplus extern "C" { diff --git a/include/kernel/sblaimgr.h b/include/kernel/sblaimgr.h index 36939ee..a691c12 100644 --- a/include/kernel/sblaimgr.h +++ b/include/kernel/sblaimgr.h @@ -1,8 +1,6 @@ #ifndef _PSP2_KERNEL_SBLACMGR_H_ #define _PSP2_KERNEL_SBLACMGR_H_ -#include <psp2kern/types.h> - #ifdef __cplusplus extern "C" { #endif diff --git a/include/kernel/sblauthmgr.h b/include/kernel/sblauthmgr.h index 43b7fd2..f8dad9c 100644 --- a/include/kernel/sblauthmgr.h +++ b/include/kernel/sblauthmgr.h @@ -1,7 +1,7 @@ #ifndef _PSP2_KERNEL_SBLAUTHMGR_H_ #define _PSP2_KERNEL_SBLAUTHMGR_H_ -#include <psp2kern/types.h> +#include <scetypes.h> #ifdef __cplusplus extern "C" { diff --git a/include/kernel/syscon.h b/include/kernel/syscon.h index 27bc0d6..59491e2 100644 --- a/include/kernel/syscon.h +++ b/include/kernel/syscon.h @@ -1,7 +1,7 @@ #ifndef _PSP2_KERN_SYSCON_H_ #define _PSP2_KERN_SYSCON_H_ -#include <psp2kern/types.h> +#include <scetypes.h> #ifdef __cplusplus extern "C" { diff --git a/include/kernel/uart.h b/include/kernel/uart.h index 97eebfd..34d21a4 100644 --- a/include/kernel/uart.h +++ b/include/kernel/uart.h @@ -1,8 +1,6 @@ #ifndef _PSP2_KERN_UART_H_ #define _PSP2_KERN_UART_H_ -#include <psp2kern/types.h> - #ifdef __cplusplus extern "C" { #endif diff --git a/include/kernel/udcd.h b/include/kernel/udcd.h index ff88e69..3b22e16 100644 --- a/include/kernel/udcd.h +++ b/include/kernel/udcd.h @@ -1,9 +1,6 @@ #ifndef _PSP2_KERNEL_UDCD_H_ #define _PSP2_KERNEL_UDCD_H_ -#include <psp2kern/types.h> -#include <dolcesdk/align.h> - #ifdef __cplusplus extern "C" { #endif @@ -211,7 +208,7 @@ typedef struct SceUdcdStringDescriptor { /** USB device descriptor */ -typedef struct SCE_ALIGN(4) SceUdcdDeviceDescriptor { +typedef struct __attribute__((__aligned__(4))) SceUdcdDeviceDescriptor { unsigned char bLength; unsigned char bDescriptorType; unsigned short bcdUSB; @@ -230,7 +227,7 @@ typedef struct SCE_ALIGN(4) SceUdcdDeviceDescriptor { /** USB device qualifier descriptor */ -typedef struct SCE_ALIGN(4) SceUdcdDeviceQualifierDescriptor { +typedef struct __attribute__((__aligned__(4))) SceUdcdDeviceQualifierDescriptor { unsigned char bLength; unsigned char bDescriptorType; unsigned short bcdUSB; @@ -376,7 +373,7 @@ typedef struct SceUdcdDeviceRequest { /** USB driver name */ -typedef struct SCE_ALIGN(16) SceUdcdDriverName { +typedef struct __attribute__((__aligned__(16))) SceUdcdDriverName { int size; char name[32]; int flags; diff --git a/include/kernel/usbd.h b/include/kernel/usbd.h index c96d4b6..c40093c 100644 --- a/include/kernel/usbd.h +++ b/include/kernel/usbd.h @@ -1,8 +1,6 @@ #ifndef _PSP2_KERNEL_USBD_H_ #define _PSP2_KERNEL_USBD_H_ -#include <psp2kern/kernel/threadmgr.h> - #ifdef __cplusplus extern "C" { #endif |