From 522a1c6ddd3c446219ef926a5373b2a69081755f Mon Sep 17 00:00:00 2001 From: Dr-Noob Date: Sat, 25 Mar 2023 12:44:10 +0100 Subject: [PATCH] [v1.03][ARM] Add Rockchip logo and colors --- src/arm/soc.c | 3 ++- src/arm/socs.h | 2 +- src/common/args.c | 2 ++ src/common/ascii.h | 11 +++++++++++ src/common/printer.c | 2 ++ src/common/printer.h | 1 + 6 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/arm/soc.c b/src/arm/soc.c index 8f868e7..dff6151 100644 --- a/src/arm/soc.c +++ b/src/arm/soc.c @@ -22,7 +22,8 @@ static char* soc_trademark_string[] = { [SOC_VENDOR_KIRIN] = "Kirin ", [SOC_VENDOR_BROADCOM] = "Broadcom BCM", [SOC_VENDOR_APPLE] = "Apple ", - [SOC_VENDOR_ALLWINNER] = "Allwinner " + [SOC_VENDOR_ALLWINNER] = "Allwinner ", + [SOC_VENDOR_ROCKCHIP] = "Rockchip ", }; static char* soc_rpi_string[] = { diff --git a/src/arm/socs.h b/src/arm/socs.h index 31ef842..5909be4 100644 --- a/src/arm/socs.h +++ b/src/arm/socs.h @@ -301,7 +301,7 @@ inline static VENDOR get_soc_vendor_from_soc(SOC soc) { else if(soc >= SOC_SNAPD_QSD8650 && soc <= SOC_SNAPD_SM8450) return SOC_VENDOR_SNAPDRAGON; else if(soc >= SOC_APPLE_M1 && soc <= SOC_APPLE_M2) return SOC_VENDOR_APPLE; else if(soc >= SOC_ALLWINNER_A10 && soc <= SOC_ALLWINNER_R328) return SOC_VENDOR_ALLWINNER; - else if(soc >= SOC_ROCKCHIP_3399 && soc <= SOC_ROCKCHIP_3399) return SOC_VENDOR_ALLWINNER; //TODO + else if(soc >= SOC_ROCKCHIP_3399 && soc <= SOC_ROCKCHIP_3399) return SOC_VENDOR_ROCKCHIP; return SOC_VENDOR_UNKNOWN; } diff --git a/src/common/args.c b/src/common/args.c index 7da6194..22d8ca7 100644 --- a/src/common/args.c +++ b/src/common/args.c @@ -12,6 +12,7 @@ #define COLOR_STR_AMD "amd" #define COLOR_STR_IBM "ibm" #define COLOR_STR_ARM "arm" +#define COLOR_STR_ROCKCHIP "rockchip" static const char *SYTLES_STR_LIST[] = { [STYLE_EMPTY] = NULL, @@ -168,6 +169,7 @@ bool parse_color(char* optarg_str, struct color*** cs) { else if(strcmp(optarg_str, COLOR_STR_AMD) == 0) color_to_copy = COLOR_DEFAULT_AMD; else if(strcmp(optarg_str, COLOR_STR_IBM) == 0) color_to_copy = COLOR_DEFAULT_IBM; else if(strcmp(optarg_str, COLOR_STR_ARM) == 0) color_to_copy = COLOR_DEFAULT_ARM; + else if(strcmp(optarg_str, COLOR_STR_ROCKCHIP) == 0) color_to_copy = COLOR_DEFAULT_ROCKCHIP; else { str_to_parse = optarg_str; free_ptr = false; diff --git a/src/common/ascii.h b/src/common/ascii.h index 01891e6..fd9a942 100644 --- a/src/common/ascii.h +++ b/src/common/ascii.h @@ -236,6 +236,16 @@ $C1 ##### ##. \ $C1 ###########. \ $C1 " +#define ASCII_ROCKCHIP \ +"$C1 \ +$C1 $C2## \ +$C1 ###### ## ## \ +$C1 ### ### ##### ##### ## ### ##### ####### ## ##### \ +$C1#######. ##. # ## ##### ### ### ### # # ### \ +$C1### ###. #### #### ### ### #### ### ### ######## \ +$C1 ## \ +$C1 " + // --------------------- LONG LOGOS ------------------------- // #define ASCII_AMD_L \ "$C1 \ @@ -337,6 +347,7 @@ asciiL logo_arm = { ASCII_ARM, 42, 5, false, {C_FG_CYAN}, asciiL logo_ibm = { ASCII_IBM, 42, 9, false, {C_FG_CYAN, C_FG_WHITE}, {C_FG_CYAN, C_FG_WHITE} }; asciiL logo_apple = { ASCII_APPLE, 32, 17, false, {C_FG_WHITE}, {C_FG_CYAN, C_FG_B_WHITE} }; asciiL logo_allwinner = { ASCII_ALLWINNER, 47, 16, false, {C_FG_CYAN}, {C_FG_B_BLACK, C_FG_B_CYAN } }; +asciiL logo_rockchip = { ASCII_ROCKCHIP, 59, 8, false, {C_FG_CYAN, C_FG_YELLOW}, {C_FG_CYAN, C_FG_YELLOW} }; // Long variants | ----------------------------------------------------------------------------------------------------| asciiL logo_amd_l = { ASCII_AMD_L, 62, 19, true, {C_BG_WHITE, C_BG_GREEN}, {C_FG_WHITE, C_FG_GREEN} }; diff --git a/src/common/printer.c b/src/common/printer.c index 16c58d2..cb0b4a8 100644 --- a/src/common/printer.c +++ b/src/common/printer.c @@ -359,6 +359,8 @@ void choose_ascii_art(struct ascii* art, struct color** cs, struct terminal* ter art->art = &logo_apple; else if(art->vendor == SOC_VENDOR_ALLWINNER) art->art = &logo_allwinner; + else if(art->vendor == SOC_VENDOR_ROCKCHIP) + art->art = &logo_rockchip; else { art->art = choose_ascii_art_aux(&logo_arm_l, &logo_arm, term, lf); } diff --git a/src/common/printer.h b/src/common/printer.h index 382b0fe..d5512d9 100644 --- a/src/common/printer.h +++ b/src/common/printer.h @@ -21,6 +21,7 @@ typedef int STYLE; #define COLOR_DEFAULT_AMD "250,250,250:000,154,102:000,000,000:250,250,250:000,154,102" #define COLOR_DEFAULT_IBM "092,119,172:092,119,172:000,000,000:240,240,240:092,119,172" #define COLOR_DEFAULT_ARM "000,145,189:000,145,189:000,000,000:240,240,240:000,145,189" +#define COLOR_DEFAULT_ROCKCHIP "017,069,202:229,195,000:000,000,000:240,240,240:015,060,176" #ifdef ARCH_X86 void print_levels(struct cpuInfo* cpu);