Overview
| Comment: | OFSystemInfo: Detect OS version & CPU on AmigaOS 3 |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
74d7354d62630af2545b92ce74e36fc4 |
| User & Date: | js on 2021-10-24 11:14:07 |
| Other Links: | manifest | tags |
Context
|
2021-10-24
| ||
| 11:15 | OFScryptTests: Disable 3rd vector on AmigaOS/m68k check-in: 051b264d4a user: js tags: trunk | |
| 11:14 | OFSystemInfo: Detect OS version & CPU on AmigaOS 3 check-in: 74d7354d62 user: js tags: trunk | |
|
2021-10-23
| ||
| 12:28 | OFUUID: Add serialization support check-in: fe84b53fd3 user: js tags: trunk | |
Changes
Modified src/OFSystemInfo.m from [da4a435ab7] to [ddb7f4310a].
| ︙ | ︙ | |||
25 26 27 28 29 30 31 32 33 34 | #ifdef HAVE_SYS_UTSNAME_H # include <sys/utsname.h> #endif #if defined(OF_MACOS) || defined(OF_NETBSD) # include <sys/sysctl.h> #endif #if defined(OF_AMIGAOS4) # include <exec/exectags.h> | > > > > > < < | 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 | #ifdef HAVE_SYS_UTSNAME_H # include <sys/utsname.h> #endif #if defined(OF_MACOS) || defined(OF_NETBSD) # include <sys/sysctl.h> #endif #ifdef OF_AMIGAOS # include <exec/execbase.h> # include <proto/exec.h> #endif #if defined(OF_AMIGAOS4) # include <exec/exectags.h> #elif defined(OF_MORPHOS) # include <exec/system.h> #endif #import "OFSystemInfo.h" #import "OFApplication.h" #import "OFArray.h" #import "OFDictionary.h" #import "OFLocale.h" |
| ︙ | ︙ | |||
210 211 212 213 214 215 216 |
}
} @finally {
objc_autoreleasePoolPop(pool);
}
# endif
#elif defined(OF_ANDROID)
/* TODO */
| | | | | < < | 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 |
}
} @finally {
objc_autoreleasePoolPop(pool);
}
# endif
#elif defined(OF_ANDROID)
/* TODO */
#elif defined(OF_AMIGAOS)
operatingSystemVersion = [[OFString alloc]
initWithFormat: @"Kickstart %u.%u",
SysBase->LibNode.lib_Version, SysBase->SoftVer];
#elif defined(OF_WII) || defined(NINTENDO_3DS) || defined(OF_NINTENDO_DS) || \
defined(OF_PSP) || defined(OF_MSDOS)
/* Intentionally nothing */
#elif defined(HAVE_SYS_UTSNAME_H) && defined(HAVE_UNAME)
struct utsname utsname;
if (uname(&utsname) != 0)
|
| ︙ | ︙ | |||
587 588 589 590 591 592 593 594 595 596 597 598 599 600 |
buffer[0] = regs.ebx;
buffer[1] = regs.edx;
buffer[2] = regs.ecx;
return [OFString stringWithCString: (char *)buffer
encoding: OFStringEncodingASCII
length: 12];
#else
return nil;
#endif
}
+ (OFString *)CPUModel
{
| > > | 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 |
buffer[0] = regs.ebx;
buffer[1] = regs.edx;
buffer[2] = regs.ecx;
return [OFString stringWithCString: (char *)buffer
encoding: OFStringEncodingASCII
length: 12];
#elif defined(OF_M68K)
return @"Motorola";
#else
return nil;
#endif
}
+ (OFString *)CPUModel
{
|
| ︙ | ︙ | |||
621 622 623 624 625 626 627 628 629 630 631 632 633 634 | GCIT_VersionString, &version, TAG_END); if (version != NULL) return [OFString stringWithFormat: @"%s V%s", model, version]; else return [OFString stringWithCString: model encoding: OFStringEncodingASCII]; #else return nil; #endif } #if defined(OF_X86_64) || defined(OF_X86) + (bool)supportsMMX | > > > > > > > > > > > > > | 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 | GCIT_VersionString, &version, TAG_END); if (version != NULL) return [OFString stringWithFormat: @"%s V%s", model, version]; else return [OFString stringWithCString: model encoding: OFStringEncodingASCII]; #elif defined(OF_AMIGAOS_M68K) if (SysBase->AttnFlags & AFF_68060) return @"68060"; if (SysBase->AttnFlags & AFF_68040) return @"68040"; if (SysBase->AttnFlags & AFF_68030) return @"68030"; if (SysBase->AttnFlags & AFF_68020) return @"68020"; if (SysBase->AttnFlags & AFF_68010) return @"68010"; else return @"68000"; #else return nil; #endif } #if defined(OF_X86_64) || defined(OF_X86) + (bool)supportsMMX |
| ︙ | ︙ |