From 34c994011ba790167c2ffa8a9f7da78e38236147 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周日, 11 10月 2020 17:09:26 +0800
Subject: [PATCH] add tests/docs for Ubuntu 20.04
---
src/library/os/linux/os_linux.cpp | 24 ++----------------------
1 files changed, 2 insertions(+), 22 deletions(-)
diff --git a/src/library/os/linux/os_linux.cpp b/src/library/os/linux/os_linux.cpp
index 57fb028..f1041a4 100644
--- a/src/library/os/linux/os_linux.cpp
+++ b/src/library/os/linux/os_linux.cpp
@@ -91,7 +91,8 @@
currentDrive = 0;
while (NULL != (ent = getmntent(aFile))) {
if ((strncmp(ent->mnt_type, "ext", 3) == 0 || strncmp(ent->mnt_type, "xfs", 3) == 0 ||
- strncmp(ent->mnt_type, "vfat", 4) == 0 || strncmp(ent->mnt_type, "ntfs", 4) == 0) &&
+ strncmp(ent->mnt_type, "vfat", 4) == 0 || strncmp(ent->mnt_type, "ntfs", 4) == 0
+ || strncmp(ent->mnt_type, "btr", 3) == 0) &&
ent->mnt_fsname != NULL && strncmp(ent->mnt_fsname, "/dev/", 5) == 0) {
if (stat(ent->mnt_fsname, &mount_stat) == 0) {
drive_found = -1;
@@ -174,27 +175,6 @@
free(statDrives);
return result;
}
-
-static void _getCpuid(unsigned int *p, unsigned int ax) {
- __asm __volatile(
- "movl %%ebx, %%esi\n\t"
- "cpuid\n\t"
- "xchgl %%ebx, %%esi"
- : "=a"(p[0]), "=S"(p[1]), "=c"(p[2]), "=d"(p[3])
- : "0"(ax));
-}
-
-FUNCTION_RETURN getCpuId(unsigned char identifier[6]) {
- unsigned int i;
- unsigned int cpuinfo[4] = {0, 0, 0, 0};
- _getCpuid(cpuinfo, 0);
- for (i = 0; i < 3; i++) {
- identifier[i * 2] = cpuinfo[i] & 0xFF;
- identifier[i * 2 + 1] = (cpuinfo[i] & 0xFF00) >> 8;
- }
- return FUNC_RET_OK;
-}
-
FUNCTION_RETURN getMachineName(unsigned char identifier[6]) {
--
Gitblit v1.9.1