Apple-2-Tools
/
apple2pi
mirror of https://github.com/dschmenk/apple2pi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update model identification code

This commit is contained in:
David Schmenk 2017-05-16 12:26:22 -07:00
parent 9e43df64ff
commit e85c7c8554
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/gpclk.c
View File

@ -73,24 +73,32 @@ void gpclk(int idiv)
unsigned int arm_base = ARMv6_PERI_BASE; // Default to ARMv6 peripheral base unsigned int arm_base = ARMv6_PERI_BASE; // Default to ARMv6 peripheral base
FILE *cpuinfo; FILE *cpuinfo;
char keystr[1024], valstr[128]; char rasstr[1024], pistr[128];
int version;
if ((cpuinfo = fopen("/proc/cpuinfo", "r") ) == NULL) if ((cpuinfo = fopen("/proc/device-tree/model", "r") ) == NULL)
{ {
printf("can't open /proc/cpuinfo\n"); printf("can't open /proc/device-tree/model\n");
exit(-1); exit(-1);
} }
while (!feof(cpuinfo)) if (fscanf(cpuinfo, "%s %s %d", rasstr, pistr, &version) == 3)
{ {
if (fscanf(cpuinfo, "%s : %s\n", keystr, valstr) == 2) if (strcmp(rasstr, "Raspberry") == 0 && strcmp(pistr, "Pi") == 0)
{ {
if (strcmp(keystr, "Hardware") == 0 && strcmp(valstr, "BCM2709") == 0) //printf("Found %s %s version %d\n", rasstr, pistr, version);
switch (version)
{ {
arm_base = ARMv7_PERI_BASE; // Pi version 2 (ARMv7) case 0:
break; case 1:
arm_base = ARMv6_PERI_BASE; // Pi version 1 (ARMv6)
break;
case 2:
case 3:
arm_base = ARMv7_PERI_BASE; // Pi version 2 and 3 (ARMv7)
break;
} }
} }
} }
fclose(cpuinfo); fclose(cpuinfo);
// Set up gpi pointer for direct register access // Set up gpi pointer for direct register access
cmgp = setup_io(arm_base + CMGP_OFFSET); cmgp = setup_io(arm_base + CMGP_OFFSET);