diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2013-09-28 04:11:59 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2013-09-28 04:11:59 +0930 |
| commit | a87884aabba198a1d44e22f89c5477f1b8167ffd (patch) | |
| tree | 92977e5fd78d97fa7c8ce6d6b61748be6cea0ba1 | |
| parent | 659efe73b8aa2cf479a8e13f81752b47d1154afc (diff) | |
cpuid: ccanlint fixes.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
| l--------- | ccan/cpuid/BSD-MIT | 1 | ||||
| -rw-r--r-- | ccan/cpuid/LICENSE | 1 | ||||
| -rw-r--r-- | ccan/cpuid/_info | 5 | ||||
| -rw-r--r-- | ccan/cpuid/cpuid.h | 2 | ||||
| -rw-r--r-- | ccan/cpuid/test/run.c | 4 |
5 files changed, 7 insertions, 6 deletions
diff --git a/ccan/cpuid/BSD-MIT b/ccan/cpuid/BSD-MIT deleted file mode 120000 index 2354d129..00000000 --- a/ccan/cpuid/BSD-MIT +++ /dev/null @@ -1 +0,0 @@ -../../licenses/BSD-MIT
\ No newline at end of file diff --git a/ccan/cpuid/LICENSE b/ccan/cpuid/LICENSE new file mode 100644 index 00000000..2354d129 --- /dev/null +++ b/ccan/cpuid/LICENSE @@ -0,0 +1 @@ +../../licenses/BSD-MIT
\ No newline at end of file diff --git a/ccan/cpuid/_info b/ccan/cpuid/_info index 1603b4be..569dc21c 100644 --- a/ccan/cpuid/_info +++ b/ccan/cpuid/_info @@ -8,10 +8,11 @@ * * Example: * #include <ccan/cpuid/cpuid.h> + * #include <stdio.h> * - * int main() + * int main(void) * { - * int highest; + * uint32_t highest; * cpuid(CPU_HIGHEST_EXTENDED_FUNCTION_SUPPORTED, &highest); * printf ("Highest extended function supported: %d\n", highest); * diff --git a/ccan/cpuid/cpuid.h b/ccan/cpuid/cpuid.h index 305d69aa..0a9fc9d9 100644 --- a/ccan/cpuid/cpuid.h +++ b/ccan/cpuid/cpuid.h @@ -69,7 +69,7 @@ typedef enum cpuid { CPU_HIGHEST_EXTENDED_FUNCTION_SUPPORTED = 0x80000000, CPU_EXTENDED_PROC_INFO_FEATURE_BITS = 0x80000001, - CPU_PROC_BRAND_STRING = 0x80000002, + CPU_PROC_BRAND_STRING = 0x80000002, CPU_L1_CACHE_AND_TLB_IDS = 0x80000005, CPU_EXTENDED_L2_CACHE_FEATURES = 0x80000006, CPU_ADV_POWER_MGT_INFO = 0x80000007, diff --git a/ccan/cpuid/test/run.c b/ccan/cpuid/test/run.c index c96f3ab8..c77fd25f 100644 --- a/ccan/cpuid/test/run.c +++ b/ccan/cpuid/test/run.c @@ -1,9 +1,9 @@ -#include "cpuid.h" +#include "../cpuid.c" #include <stdio.h> #include <stdint.h> -int main() +int main(void) { if (!cpuid_is_supported()) { printf ("CPUID instruction is not supported by this CPU\n"); |