Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45c4c06f authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "Remove unused cruft from libcutils."

parents 9f72ef89 f21717cd
Loading
Loading
Loading
Loading

include/cutils/cpu_info.h

deleted100644 → 0
+0 −34
Original line number Diff line number Diff line
/*
 * Copyright (C) 2007 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

#ifndef __CUTILS_CPU_INFO_H
#define __CUTILS_CPU_INFO_H

#ifdef __cplusplus
extern "C" {
#endif

/* returns a string contiaining an ASCII representation of the CPU serial number, 
** or NULL if cpu info not available.
** The string is a static variable, so don't call free() on it.
*/
extern const char* get_cpu_serial_number(void);
    
#ifdef __cplusplus
}
#endif

#endif /* __CUTILS_CPU_INFO_H */ 
+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ commonSources := \
	atomic.c.arm \
	native_handle.c \
	config_utils.c \
	cpu_info.c \
	load_file.c \
	open_memstream.c \
	strdup16to8.c \

libcutils/cpu_info.c

deleted100644 → 0
+0 −82
Original line number Diff line number Diff line
/*
** Copyright 2007, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License"); 
** you may not use this file except in compliance with the License. 
** You may obtain a copy of the License at 
**
**     http://www.apache.org/licenses/LICENSE-2.0 
**
** Unless required by applicable law or agreed to in writing, software 
** distributed under the License is distributed on an "AS IS" BASIS, 
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
** See the License for the specific language governing permissions and 
** limitations under the License.
*/

#include <stdio.h>
#include <stdlib.h>
#include <string.h>

#include <cutils/cpu_info.h>

// we cache the serial number here.
// this is also used as a fgets() line buffer when we are reading /proc/cpuinfo
static char serial_number[100] = { 0 };

extern const char* get_cpu_serial_number(void)
{
    if (serial_number[0] == 0)
    {
        FILE* file;
        char* chp, *end;
        char* whitespace;
        
        // read serial number from /proc/cpuinfo
        file = fopen("proc/cpuinfo", "r");
        if (! file)
            return NULL;
        
        while ((chp = fgets(serial_number, sizeof(serial_number), file)) != NULL)
        {
            // look for something like "Serial          : 999206122a03591c"

            if (strncmp(chp, "Serial", 6) != 0)
                continue;
            
            chp = strchr(chp, ':');
            if (!chp)
                continue;
                
             // skip colon and whitespace
            while ( *(++chp) == ' ') {}
            
            // truncate trailing whitespace
            end = chp;
            while (*end && *end != ' ' && *end != '\t' && *end != '\n' && *end != '\r')
                ++end;
            *end = 0; 
            
            whitespace = strchr(chp, ' ');
            if (whitespace)
                *whitespace = 0;
            whitespace = strchr(chp, '\t');
            if (whitespace)
                *whitespace = 0;
            whitespace = strchr(chp, '\r');
            if (whitespace)
                *whitespace = 0;
            whitespace = strchr(chp, '\n');
            if (whitespace)
                *whitespace = 0;

            // shift serial number to beginning of the buffer
            memmove(serial_number, chp, strlen(chp) + 1);
            break;
        }
        
        fclose(file);
    }

    return (serial_number[0] ? serial_number : NULL);
}