early-access version 2847

externals/SDL/src/joystick/vita/SDL_sysjoystick.c

@@ -147,7 +147,7 @@ int VITA_JoystickInit(void)
     // after the app has already started.
 
     SDL_numjoysticks = 1;
-    SDL_PrivateJoystickAdded(0);
+
     // How many additional paired controllers are there?
     sceCtrlGetControllerPortInfo(&myPortInfo);
 
@@ -157,7 +157,6 @@ int VITA_JoystickInit(void)
     {
         if (myPortInfo.port[i]!=SCE_CTRL_TYPE_UNPAIRED)
         {
-            SDL_PrivateJoystickAdded(SDL_numjoysticks);
             SDL_numjoysticks++;
         }
     }
@@ -179,6 +178,7 @@ SDL_JoystickID VITA_JoystickGetDeviceInstanceID(int device_index)
     return device_index;
 }
 
+/* Function to get the device-dependent name of a joystick */
 const char *VITA_JoystickGetDeviceName(int index)
 {
     if (index == 0)
@@ -194,12 +194,7 @@ const char *VITA_JoystickGetDeviceName(int index)
         return "PSVita Controller";
 
     SDL_SetError("No joystick available with that index");
-    return NULL;
-}
-
-const char *VITA_JoystickGetDevicePath(int index)
-{
-    return NULL;
+    return(NULL);
 }
 
 static int
@@ -404,7 +399,6 @@ SDL_JoystickDriver SDL_VITA_JoystickDriver =
     VITA_JoystickGetCount,
     VITA_JoystickDetect,
     VITA_JoystickGetDeviceName,
-    VITA_JoystickGetDevicePath,
     VITA_JoystickGetDevicePlayerIndex,
     VITA_JoystickSetDevicePlayerIndex,
     VITA_JoystickGetDeviceGUID,