Merge branch 'master' into pu/fb-setmode

Origin commit data
------------------
Commit: 94492c4271
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-09 (Thu, 09 Mar 2017)
This commit is contained in:
Michael Liebmann
2017-03-09 15:17:25 +01:00

View File

@@ -18,6 +18,7 @@ hw_caps_t *get_hwcaps(void) {
if (initialized) if (initialized)
return &caps; return &caps;
int rev = cs_get_revision(); int rev = cs_get_revision();
int chip = cs_get_chip_type();
caps.has_fan = (rev < 8); caps.has_fan = (rev < 8);
caps.has_HDMI = 1; caps.has_HDMI = 1;
caps.has_SCART = (rev != 10); caps.has_SCART = (rev != 10);
@@ -54,13 +55,29 @@ hw_caps_t *get_hwcaps(void) {
caps.force_tuner_2G = 1; caps.force_tuner_2G = 1;
break; break;
case 11: case 11:
strcpy(caps.boxname, "Trinity"); if (chip == 33904 /*0x8470*/)
strcpy(caps.boxarch, "Shiner"); {
strcpy(caps.boxname, "Trinity");
strcpy(caps.boxarch, "Shiner");
}
else
{
strcpy(caps.boxname, "Trinity V2");
strcpy(caps.boxarch, "Kronos");
}
break; break;
case 12: case 12:
strcpy(caps.boxname, "Zee2"); strcpy(caps.boxname, "Zee2");
strcpy(caps.boxarch, "Kronos"); strcpy(caps.boxarch, "Kronos");
break; break;
case 13:
strcpy(caps.boxname, "Link");
strcpy(caps.boxarch, "Kronos");
break;
case 14:
strcpy(caps.boxname, "Trinity Duo");
strcpy(caps.boxarch, "Kronos");
break;
default: default:
strcpy(caps.boxname, "UNKNOWN_BOX"); strcpy(caps.boxname, "UNKNOWN_BOX");
strcpy(caps.boxarch, "Unknown"); strcpy(caps.boxarch, "Unknown");
@@ -69,4 +86,3 @@ hw_caps_t *get_hwcaps(void) {
initialized = 1; initialized = 1;
return &caps; return &caps;
} }