Merge pull request #806 from uyjulian/add_names_to_callbacks

Variable and argument name additions

Author: rickgaiser

common/include/libcdvd-common.h

@@ -916,10 +916,10 @@ extern int sceCdStSeekF(unsigned int lsn);
  * SUPPORTED IN NEWER CDVDMAN MODULES INCLUDED WITHIN NEWER IOPRP ONLY
  *
  * @param func pointer of callback function to be called when power-off processing is activated
- * @param addr an argument which will be passed to the callback function
+ * @param userdata an argument which will be passed to the callback function
  * returns: a pointer to the previous handler function, or a null pointer if nothing has been set eariler
  */
-extern void *sceCdPOffCallback(void (*func)(void *), void *addr);
+extern void *sceCdPOffCallback(void (*func)(void *userdata), void *userdata);
 
 /** Sets the timeout lengths for the certain CDVDMAN's operations.
  * SUPPORTED IN NEWER CDVDMAN MODULES INCLUDED WITHIN NEWER IOPRP ONLY

common/include/libsd-common.h

@@ -144,8 +144,8 @@ typedef struct
     int feedback;
 } sceSdEffectAttr;
 
-typedef int (*sceSdSpu2IntrHandler)(int, void *);
-typedef int (*sceSdTransIntrHandler)(int, void *);
+typedef int (*sceSdSpu2IntrHandler)(int core_bit, void *arg);
+typedef int (*sceSdTransIntrHandler)(int core, void *arg);
 typedef int (*SdIntrCallback)(void *data);
 typedef int (*sceSdBlockTransHandler)(int channel, void *userdata, void **addr, int *size);
 

common/sbus/src/ee_sbus.c

@@ -104,7 +104,7 @@ void _SetIntcHandler(int irq, void *handler)
     i_state = DI();
     u_state = (ee_kmode_enter() >> 3) & 3;
 
-    ((void (*)(int, void *))(0x80000700))(irq, handler);
+    ((void (*)(int irq, void *handler))(0x80000700))(irq, handler);
 
     if (u_state) {
         ee_kmode_exit();

ee/graph/include/graph.h

@@ -132,7 +132,7 @@ extern void graph_set_bgcolor(unsigned char r, unsigned char g, unsigned char b)
 extern void graph_set_output(int rc1, int rc2, int alpha_select, int alpha_output, int blend_method, unsigned char alpha);
 
 /** Add a vsync interrupt handler */
-extern int graph_add_vsync_handler(int (*vsync_callback)(int));
+extern int graph_add_vsync_handler(int (*vsync_callback)(int cause));
 
 /** Remove a vsync interrupt handler */
 extern void graph_remove_vsync_handler(int callback_id);

ee/graph/src/graph.c

@@ -26,7 +26,7 @@ int graph_initialize(int fbp, int width, int height, int psm, int x, int y)
 
 }
 
-int graph_add_vsync_handler(int (*vsync_callback)(int))
+int graph_add_vsync_handler(int (*vsync_callback)(int cause))
 {
 
 	int callback_id;

ee/iopreboot/src/imgdrv/src/imgdrv.c

@@ -29,14 +29,14 @@ static int imgdrv_lseek(iop_file_t *f, int offset, int whence);
     but the structure in the original was this short (probably to save space). */
 typedef struct _iop_device_ops_short
 {
-    int (*init)(iop_device_t *);
-    int (*deinit)(iop_device_t *);
-    int (*format)(iop_file_t *);
-    int (*open)(iop_file_t *, const char *, int);
-    int (*close)(iop_file_t *);
-    int (*read)(iop_file_t *, void *, int);
-    int (*write)(iop_file_t *, void *, int);
-    int (*lseek)(iop_file_t *, int, int);
+    int (*init)(iop_device_t *device);
+    int (*deinit)(iop_device_t *device);
+    int (*format)(iop_file_t *f);
+    int (*open)(iop_file_t *f, const char *name, int flags);
+    int (*close)(iop_file_t *f);
+    int (*read)(iop_file_t *f, void *ptr, int size);
+    int (*write)(iop_file_t *f, void *ptr, int size);
+    int (*lseek)(iop_file_t *f, int offset, int mode);
 } iop_device_ops_short_t;
 
 IOMAN_RETURN_VALUE_IMPL(0);

ee/kernel/src/debug.c

@@ -26,7 +26,7 @@ void InitDebug(void)
         if ((jalPrintf & 0xFC000000) == 0xC000000)
         {
             // Get the call target which is the address of printf.
-            krnl_print = (void(*)(const char*, ...))(0x80000000 + ((jalPrintf & 0x3FFFFFF) << 2));
+            krnl_print = (void(*)(const char* format, ...))(0x80000000 + ((jalPrintf & 0x3FFFFFF) << 2));
             break;
         }
     }

ee/kernel/src/osdsrc/src/ExecPS2.c

@@ -48,7 +48,7 @@ struct TCB
     struct TCB *next;       //+00
     struct TCB *prev;       //+04
     int status;             //+08
-    void (*entry)(void *);  //+0C
+    void (*entry)(void *d); //+0C
     void *stack_res;        //+10 initial $sp
     void *gpReg;            //+14
     short currentPriority;  //+18
@@ -58,7 +58,7 @@ struct TCB
         wakeupCount,        //+24
         attr,               //+28
         option;             //+2C
-    void (*entry_)(void *); //+30
+    void (*entry_)(void *d);//+30
     int argc;               //+34
     char *argstring;        //+38
     void *stack;            //+3C

ee/libcglue/src/glue.c

@@ -566,7 +566,7 @@ int rmdir(const char *path) {
 
 #ifdef F__link
 // Called from newlib linkr.c
-int _link(const char *old, const char *new) {
+int _link(const char *old, const char *new_) {
 	errno = ENOSYS;
 	return -1; /* not supported */
 }
@@ -593,7 +593,7 @@ int _unlink(const char *path) {
 
 #ifdef F__rename
 // Called from newlib renamer.c
-int _rename(const char *old, const char *new) {
+int _rename(const char *old, const char *new_) {
 	char oldname[MAXNAMLEN + 1];
 	char newname[MAXNAMLEN + 1];
 
@@ -602,7 +602,7 @@ int _rename(const char *old, const char *new) {
 		return -1;
 	}
 
-	if(__path_absolute(new, newname, MAXNAMLEN) < 0) {
+	if(__path_absolute(new_, newname, MAXNAMLEN) < 0) {
 		errno = ENAMETOOLONG;
 		return -1;
 	}

ee/libcglue/src/timezone.c

@@ -24,7 +24,7 @@
 #define OSD_CONFIG_NO_LIBCDVD
 #include "osd_config.h"
 
-#define posixIODriver { open, close, (int (*)(int, void *, int))read, O_RDONLY }
+#define posixIODriver { open, close, (int (*)(int fd, void *buf, int nbyte))read, O_RDONLY }
 
 #ifdef F__libcglue_timezone_update_impl
 void _libcglue_timezone_update_impl()