Skip to content

Commit 31187f6

Browse files
SergeySliceSergeySlice
committed
2 parents 4b2e9d6 + 9337508 commit 31187f6

File tree

13 files changed

+103
-380
lines changed

13 files changed

+103
-380
lines changed

‎CloverPackage/makeiso

+7-7
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,13 @@ mkdir -p ${IMGROOT}/usr/bin
7777
echo "[MKDIR] ${IMGROOT}/usr/local/bin"
7878
mkdir -p "${IMGROOT}"/usr/local/bin
7979
cp -p "${SYMROOT}"/utils/* "${IMGROOT}"/usr/local/bin
80-
echo "[MKDIR] ${IMGROOT}/Library/Application Support/Clover"
81-
mkdir -p "${IMGROOT}/Library/Application Support/Clover"
82-
cp -p "${SRCROOT}"/CloverUpdater/CloverUpdaterUtility "${IMGROOT}/Library/Application Support/Clover/"
83-
cp -pr "${SRCROOT}"/CloverUpdater/build/CloverUpdater.app "${IMGROOT}/Library/Application Support/Clover/"
84-
echo "[MKDIR] ${IMGROOT}/Library/PreferencePanes"
85-
mkdir -p "${IMGROOT}/Library/PreferencePanes"
86-
cp -pr "${SRCROOT}"/CloverPrefpane/Build/Clover.prefPane "${IMGROOT}/Library/PreferencePanes/"
80+
#echo "[MKDIR] ${IMGROOT}/Library/Application Support/Clover"
81+
#mkdir -p "${IMGROOT}/Library/Application Support/Clover"
82+
#cp -p "${SRCROOT}"/CloverUpdater/CloverUpdaterUtility "${IMGROOT}/Library/Application Support/Clover/"
83+
#cp -pr "${SRCROOT}"/CloverUpdater/build/CloverUpdater.app "${IMGROOT}/Library/Application Support/Clover/"
84+
#echo "[MKDIR] ${IMGROOT}/Library/PreferencePanes"
85+
#mkdir -p "${IMGROOT}/Library/PreferencePanes"
86+
#cp -pr "${SRCROOT}"/CloverPrefpane/Build/Clover.prefPane "${IMGROOT}/Library/PreferencePanes/"
8787
echo "[CP] cdboot"
8888
cp -f ${SYMROOT}/i386/cdboot ${CDBOOT}
8989
echo "[CP] $THEME"

‎CloverPackage/package/po/clover.pot

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
#, fuzzy
77
msgid ""
88
msgstr ""
9-
"Project-Id-Version: Clover r5142\n"
10-
"POT-Creation-Date: 2021-11-02 19:01+0300\n"
9+
"Project-Id-Version: Clover r5145\n"
10+
"POT-Creation-Date: 2022-03-16 19:08+0300\n"
1111
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1212
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1313
"Language-Team: LANGUAGE <LL@li.org>\n"

‎Library/MemLogLibDefault/printf_lite.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,7 @@ __attribute__((noinline, section(".printf_lite")))
512512
#endif
513513
static void print_ulonglong(UINT_BIGGEST_TYPE v, unsigned int base, PrintfParams* printfParams, int printfSign)
514514
{
515-
int n = 0;
515+
// int n = 0;
516516
unsigned INT_BIGGEST_TYPE d = 1;
517517
#if PRINTF_LITE_FIELDWIDTH_SUPPORT == 1
518518
int nbDigits = 1 + printfSign;
@@ -550,7 +550,7 @@ static void print_ulonglong(UINT_BIGGEST_TYPE v, unsigned int base, PrintfParams
550550
#else
551551
print_char_macro( (char)(dgt + '0'), printfParams);
552552
#endif
553-
n += 1;
553+
// n += 1;
554554
}
555555
}
556556

‎rEFIt_UEFI/Platform/Injectors.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ UINT8* mProperties = NULL;
4444
CHAR8* gDeviceProperties = NULL;
4545

4646
UINT32 cPropSize = 0;
47-
UINT8* cProperties = NULL;
47+
UINT8* cProperties = NULL; //this is properties as string
4848
CHAR8* BootOSName = NULL;
4949

5050
UINT16 KeyboardVendor = 0x05ac; //Apple inc.

‎rEFIt_UEFI/Platform/Settings.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -967,6 +967,7 @@ SetDevices (LOADER_ENTRY *Entry)
967967
MsgLog("Properties with Label=%ls ignored because getDevicePath() return NULL\n", Prop.DevicePathAsString.wc_str());
968968
continue;
969969
}
970+
970971
device = devprop_add_device_pci(device_inject_string, NULL, DevicePath);
971972
DBG("add device: %ls\n", Prop.DevicePathAsString.wc_str());
972973
for ( size_t jdx = 0 ; jdx < Prop.propertiesArray.size() ; ++jdx ) {
@@ -1799,6 +1800,7 @@ SetDevices (LOADER_ENTRY *Entry)
17991800
// StringDirty = false;
18001801
//-------
18011802
mPropSize = (UINT32)hex2bin(newDeviceProperties, mProperties, EFI_PAGES_TO_SIZE(nbPages)); // cast should be safe as hex2bin return <= MAXUINT32
1803+
// gDeviceProperties is not used
18021804
gDeviceProperties = newDeviceProperties.forgetDataWithoutFreeing(); // do this AFTER hex2bin
18031805
// DBG("Final size of mProperties=%d\n", mPropSize);
18041806
//---------

‎rEFIt_UEFI/Platform/ati.cpp

+24-15
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,12 @@ const card_config_t card_configs[] = {
142142
{"Elqui", 5},
143143
{"Caroni", 5},
144144
{"Florin", 6},
145+
{"Python", 3},
146+
{"Adder", 3},
147+
{"Henbury",3},
148+
{"Belknap",3},
149+
{"Carswell",3},
150+
145151
{"Radeon",4},
146152
};
147153

@@ -320,18 +326,18 @@ const radeon_card_info_t radeon_cards[] = {
320326
{ 0x67CA, CHIP_FAMILY_ELLESMERE, "AMD Radeon Polaris 10", kNull },
321327
{ 0x67CC, CHIP_FAMILY_ELLESMERE, "AMD Radeon Polaris 10", kNull },
322328
{ 0x67CF, CHIP_FAMILY_ELLESMERE, "AMD Radeon Polaris 10", kNull },
323-
{ 0x67DF, CHIP_FAMILY_ELLESMERE, "AMD Radeon RX 480/570/580", kBaladi },
329+
{ 0x67DF, CHIP_FAMILY_ELLESMERE, "AMD Radeon RX 480/570/580", kOrinoco },
324330

325331
// Polaris 11
326332
{ 0x67E0, CHIP_FAMILY_BAFFIN, "AMD Radeon RX 460", kAcre },
327333
{ 0x67E1, CHIP_FAMILY_BAFFIN, "AMD Radeon Polaris 11", kNull },
328-
{ 0x67E3, CHIP_FAMILY_BAFFIN, "AMD Radeon Polaris 11", kNull },
334+
{ 0x67E3, CHIP_FAMILY_BAFFIN, "AMD Radeon Pro WX4100", kNull },
329335
{ 0x67E7, CHIP_FAMILY_BAFFIN, "AMD Radeon Polaris 11", kNull },
330336
{ 0x67E8, CHIP_FAMILY_BAFFIN, "AMD Radeon Polaris 11", kNull },
331337
{ 0x67E9, CHIP_FAMILY_BAFFIN, "AMD Radeon Polaris 11", kNull },
332338
{ 0x67EB, CHIP_FAMILY_BAFFIN, "AMD Radeon Polaris 11", kNull },
333-
{ 0x67EF, CHIP_FAMILY_BAFFIN, "AMD Radeon Pro 555", kAcre }, //fb=Caroni in 10.13.6
334-
{ 0x67FF, CHIP_FAMILY_BAFFIN, "AMD Radeon RX 560", kNull },
339+
{ 0x67EF, CHIP_FAMILY_BAFFIN, "AMD Radeon Pro 555", kAcre }, //fb=Caroni in 10.13.6
340+
{ 0x67FF, CHIP_FAMILY_BAFFIN, "AMD Radeon RX 560", kNull },
335341

336342
// PITCAIRN
337343
{ 0x6800, CHIP_FAMILY_PITCAIRN, "AMD Radeon HD 7970M", kBuri }, // Mobile
@@ -504,6 +510,8 @@ const radeon_card_info_t radeon_cards[] = {
504510
{ 0x7300, CHIP_FAMILY_FIJI, "AMD Radeon R9 Fury", kNull },
505511
// Navi10
506512
{ 0x731F, CHIP_FAMILY_NAVI10, "AMD Radeon RX5700", kNull },
513+
// Navi15
514+
{ 0x7340, CHIP_FAMILY_NAVI10, "AMD Radeon RX5500", kNull },
507515
// Navi21
508516
{ 0x73BF, CHIP_FAMILY_NAVI20, "AMD Radeon RX6800XT", kNull },
509517
/*
@@ -1287,7 +1295,7 @@ AtiDevProp ati_devprop_list[] = {
12871295

12881296
// {FLAGTRUE, false, "ATY,MCLK", get_mclk_val, NULVAL },
12891297
// {FLAGTRUE, false, "ATY,SCLK", get_sclk_val, NULVAL },
1290-
{FLAGTRUE, false, "ATY,RefCLK", get_refclk_val, DWRVAL(0x0a8c) },
1298+
//{FLAGTRUE, false, "ATY,RefCLK", get_refclk_val, DWRVAL(0x0a8c) },
12911299

12921300
{FLAGTRUE, false, "ATY,PlatformInfo", get_platforminfo_val, NULVAL },
12931301
{FLAGOLD, false, "compatible", get_name_pci_val, NULVAL },
@@ -1312,7 +1320,7 @@ XBool get_bootdisplay_val(value_t *val, INTN index, XBool Sier)
13121320
v = 1;
13131321
val->type = kCst;
13141322
val->size = 4;
1315-
val->data = (__typeof__(val->data))AllocatePool(4);
1323+
val->data = (__typeof__(val->data))AllocateZeroPool(4);
13161324
*(val->data) = (UINT8)v;
13171325
return true;
13181326
}
@@ -1334,7 +1342,7 @@ XBool get_dual_link_val(value_t *val, INTN index, XBool Sier)
13341342

13351343
val->type = kCst;
13361344
val->size = 4;
1337-
val->data = (__typeof__(val->data))AllocatePool(4);
1345+
val->data = (__typeof__(val->data))AllocateZeroPool(4);
13381346
*(val->data) = (UINT8)v;
13391347
return true;
13401348
}
@@ -1415,6 +1423,8 @@ XBool get_name_pci_val(value_t *val, INTN index, XBool Sier)
14151423
return true;
14161424
}
14171425

1426+
const char AMDRadeon[] = "AMD Radeon %s";
1427+
14181428
XBool get_model_val(value_t *val, INTN index, XBool Sier)
14191429
{
14201430
CHAR8 *ModelName = (__typeof__(ModelName))AllocateZeroPool(35);
@@ -1428,25 +1438,25 @@ XBool get_model_val(value_t *val, INTN index, XBool Sier)
14281438
} else {
14291439
switch (card->pci_dev->revision) {
14301440
case 0xC4:
1431-
snprintf(ModelName, 35, "AMD Radeon %s", "Pro 550");
1441+
snprintf(ModelName, 35, AMDRadeon, "Pro 550");
14321442
break;
14331443
case 0xC7:
1434-
snprintf(ModelName, 35, "AMD Radeon %s", "RX 480");
1444+
snprintf(ModelName, 35, AMDRadeon, "RX 480");
14351445
break;
14361446
case 0xC5:
14371447
case 0xCF:
14381448
case 0xD7:
14391449
case 0xE0:
1440-
snprintf(ModelName, 35, "AMD Radeon %s", "RX 470");
1450+
snprintf(ModelName, 35, AMDRadeon, "RX 470");
14411451
break;
14421452
case 0xC2:
14431453
case 0xC6:
14441454
case 0xEF:
1445-
snprintf(ModelName, 35, "AMD Radeon %s", "RX 570");
1455+
snprintf(ModelName, 35, AMDRadeon, "RX 570");
14461456
break;
14471457

14481458
default:
1449-
snprintf(ModelName, 35, "AMD Radeon %s", "RX 580");
1459+
snprintf(ModelName, 35, AMDRadeon, "RX 580");
14501460
break;
14511461
}
14521462
val->size = (UINT32)AsciiStrLen(ModelName);
@@ -1529,7 +1539,7 @@ XBool get_binimage_owr(value_t *val, INTN index, XBool Sier)
15291539
}
15301540
val->type = kCst;
15311541
val->size = 4;
1532-
val->data = (__typeof__(val->data))AllocatePool(4);
1542+
val->data = (__typeof__(val->data))AllocateZeroPool(4);
15331543
*(val->data) = 1;
15341544
return true;
15351545
}
@@ -1944,7 +1954,7 @@ XBool radeon_card_posted(void)
19441954
{
19451955
UINTN reg;
19461956
// ati_chip_family_t chip_family = card->info->chip_family;
1947-
#if 1
1957+
#if 0
19481958
//dump radeon registers after BIOS POST
19491959
reg = (UINTN)REG32(card->mmio, RADEON_BIOS_0_SCRATCH);
19501960
// DBG("BIOS_0_SCRATCH=0x%08llX, ", reg);
@@ -2233,7 +2243,6 @@ XBool setup_ati_devprop(LOADER_ENTRY *Entry, pci_dt_t *ati_dev)
22332243
}
22342244
}
22352245

2236-
22372246
DBG("ATI %s %s %dMB (%s) [%04hX:%04hX] (subsys [%04hX:%04hX]):: %s\n",
22382247
chip_family_name[card->info->chip_family], card->info->model_name,
22392248
(UINT32)RShiftU64(card->vram_size, 20), card->cfg_name,

‎rEFIt_UEFI/Platform/ati.h

+6
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,14 @@ typedef enum {
220220
kElqui,
221221
kCaroni,
222222
kFlorin,
223+
kPython,
224+
kAdder,
225+
kHenbury,
226+
kBelknap,
227+
kCarswell,
223228
kRadeon, // this is absent FB if not set
224229
kCfgEnd
230+
225231
} config_name_t;
226232

227233
typedef struct {

0 commit comments

Comments
 (0)