diff --git a/frontend/frontend_context.h b/frontend/frontend_context.h index 1a01c50954..3c7a702c7e 100644 --- a/frontend/frontend_context.h +++ b/frontend/frontend_context.h @@ -41,6 +41,7 @@ typedef struct frontend_ctx_driver int (*process_events)(void *data); void (*exec)(const char *, bool); void (*shutdown)(bool); + int (*get_name)(char *, size_t); int (*get_rating)(void); // Human readable string. diff --git a/frontend/platform/platform_android.c b/frontend/platform/platform_android.c index 7e67242fc8..cd8745771d 100644 --- a/frontend/platform/platform_android.c +++ b/frontend/platform/platform_android.c @@ -701,13 +701,16 @@ static void frontend_android_shutdown(bool unused) exit(0); } +static void frontend_android_get_name(char *name, size_t sizeof_name) +{ + int len = __system_property_get("ro.product.model", name); + (void)len; +} + static int frontend_android_get_rating(void) { char model_id[PROP_VALUE_MAX]; - int len; - - len = __system_property_get("ro.product.model", model_id); - (void)len; + frontend_android_get_name(&model_id, sizeof(model_id)); RARCH_LOG("ro.product.model: (%s).\n", model_id); @@ -729,6 +732,7 @@ const frontend_ctx_driver_t frontend_ctx_android = { frontend_android_process_events, /* process_events */ NULL, /* exec */ frontend_android_shutdown, /* shutdown */ + frontend_android_get_name, /* get_name */ frontend_android_get_rating, /* get_rating */ "android", }; diff --git a/frontend/platform/platform_apple.c b/frontend/platform/platform_apple.c index 9301be54db..e92dde002d 100644 --- a/frontend/platform/platform_apple.c +++ b/frontend/platform/platform_apple.c @@ -131,6 +131,7 @@ const frontend_ctx_driver_t frontend_ctx_apple = { NULL, /* process_events */ NULL, /* exec */ NULL, /* shutdown */ + NULL, /* get_name */ frontend_apple_get_rating, /* get_rating */ "apple", }; diff --git a/frontend/platform/platform_gx.c b/frontend/platform/platform_gx.c index ff40c942a9..d2cc79baa0 100644 --- a/frontend/platform/platform_gx.c +++ b/frontend/platform/platform_gx.c @@ -339,6 +339,7 @@ const frontend_ctx_driver_t frontend_ctx_gx = { NULL, /* process_events */ frontend_gx_exec, /* exec */ NULL, /* shutdown */ - frontend_gx_get_rating, /* get_rating */ + NULL, /* get_name */ + frontend_gx_get_rating, /* get_rating */ "gx", }; diff --git a/frontend/platform/platform_null.c b/frontend/platform/platform_null.c index 36b951522e..8c337cfe63 100644 --- a/frontend/platform/platform_null.c +++ b/frontend/platform/platform_null.c @@ -21,12 +21,6 @@ #include #include -static int frontend_null_get_rating(void) -{ - /* TODO/FIXME: Determine rating */ - return -1; -} - const frontend_ctx_driver_t frontend_ctx_null = { NULL, /* environment_get */ NULL, /* init */ @@ -36,6 +30,7 @@ const frontend_ctx_driver_t frontend_ctx_null = { NULL, /* process_events */ NULL, /* exec */ NULL, /* shutdown */ - frontend_null_get_rating, /* get_rating */ + NULL, /* get_name */ + NULL, /* get_rating */ "null", }; diff --git a/frontend/platform/platform_ps3.c b/frontend/platform/platform_ps3.c index b8ebe93c53..d7c13e045c 100644 --- a/frontend/platform/platform_ps3.c +++ b/frontend/platform/platform_ps3.c @@ -440,6 +440,7 @@ const frontend_ctx_driver_t frontend_ctx_ps3 = { NULL, /* process_events */ frontend_ps3_exec, /* exec */ NULL, /* shutdown */ + NULL, /* get_name */ frontend_ps3_get_rating, /* get_rating */ "ps3", }; diff --git a/frontend/platform/platform_psp.c b/frontend/platform/platform_psp.c index 4638cb94dc..bd26f5a3fe 100644 --- a/frontend/platform/platform_psp.c +++ b/frontend/platform/platform_psp.c @@ -217,6 +217,7 @@ const frontend_ctx_driver_t frontend_ctx_psp = { NULL, /* process_events */ frontend_psp_exec, /* exec */ frontend_psp_shutdown, /* shutdown */ + NULL, /* get_name */ frontend_psp_get_rating, /* get_rating */ "psp", }; diff --git a/frontend/platform/platform_qnx.c b/frontend/platform/platform_qnx.c index a774fc0b76..85ebe178ac 100644 --- a/frontend/platform/platform_qnx.c +++ b/frontend/platform/platform_qnx.c @@ -51,6 +51,7 @@ const frontend_ctx_driver_t frontend_ctx_qnx = { NULL, /* process_events */ NULL, /* exec */ frontend_qnx_shutdown, /* shutdown */ + NULL, /* get_name */ frontend_qnx_get_rating, /* get_rating */ "qnx", }; diff --git a/frontend/platform/platform_xdk.c b/frontend/platform/platform_xdk.c index 330476ec1f..bfb296c296 100644 --- a/frontend/platform/platform_xdk.c +++ b/frontend/platform/platform_xdk.c @@ -302,8 +302,6 @@ static int frontend_xdk_get_rating(void) return 11; #elif defined(_XBOX1) return 7; -#else - return -1; #endif } @@ -316,6 +314,7 @@ const frontend_ctx_driver_t frontend_ctx_xdk = { NULL, /* process_events */ frontend_xdk_exec, /* exec */ NULL, /* shutdown */ + NULL, /* get_name */ frontend_xdk_get_rating, /* get_rating */ "xdk", };