[v1.01][ARM] Merge changes from feat2 (added Allwinner CPUs)

This commit is contained in:
Dr-Noob
2021-12-07 13:28:54 +01:00
5 changed files with 101 additions and 6 deletions

View File

@@ -218,6 +218,24 @@ $C1 kMMMMMMMMMMMMMMMMMMMMMMd \
$C1 'KMMMMMMMWXXWMMMMMMMk. \
$C1 \"cooc\"* \"*coo'\" "
#define ASCII_ALLWINNER \
"$C1 \
$C1 ################# \
$C1 .######## ##### #### \
$C1 ###### ####### \
$C1 #####. ## ..## ####. \
$C1 .#### #### ##### #### \
$C1 #### ## ### ###. ##### . \
$C1#### ## ## #### .###### ####* . \
$C1### ## ##.### ## #### .###### \
$C1### #.## ### ##### ##### . \
$C1### ### ### .### ### . \
$C1 #### ### #### #. \
$C1 #### #* \
$C1 ##### ##. \
$C1 ###########. \
$C1 "
// --------------------- LONG LOGOS ------------------------- //
#define ASCII_AMD_L \
"$C1 \
@@ -318,6 +336,8 @@ asciiL logo_broadcom = { ASCII_BROADCOM, 44, 19, false, {C_FG_WHITE, C_FG_
asciiL logo_arm = { ASCII_ARM, 42, 5, false, {C_FG_CYAN}, {C_FG_WHITE, 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 } };
// Long variants | ----------------------------------------------------------------------------------------------------|
asciiL logo_amd_l = { ASCII_AMD_L, 62, 19, true, {C_BG_WHITE, C_BG_GREEN}, {C_FG_WHITE, C_FG_GREEN} };
asciiL logo_intel_l = { ASCII_INTEL_L, 62, 19, true, {C_BG_CYAN, C_BG_WHITE}, {C_FG_CYAN, C_FG_WHITE} };

View File

@@ -353,6 +353,8 @@ void choose_ascii_art(struct ascii* art, struct color** cs, struct terminal* ter
art->art = &logo_broadcom;
else if(art->vendor == SOC_VENDOR_APPLE)
art->art = &logo_apple;
else if(art->vendor == SOC_VENDOR_ALLWINNER)
art->art = &logo_allwinner;
else {
art->art = choose_ascii_art_aux(&logo_arm_l, &logo_arm, term, lf);
}