diff options
| author | Shuah Khan <shuahkh@osg.samsung.com> | 2016-09-22 00:54:36 +0200 |
|---|---|---|
| committer | Shuah Khan <shuahkh@osg.samsung.com> | 2016-09-23 21:07:27 +0200 |
| commit | a67cd5482f37a255b9990ddb942aa7009dcba12f (patch) | |
| tree | a12daae75e787e134d2b0813fa089ce2365e2ac8 /Documentation | |
| parent | tools: move laptops dslm tool from Documentation (diff) | |
| download | linux-a67cd5482f37a255b9990ddb942aa7009dcba12f.tar.xz linux-a67cd5482f37a255b9990ddb942aa7009dcba12f.zip | |
tools: move pcmcia crc32hash tool from Documentation
Move pcmcia crc32hash tool from Documentation to tools/pcmcia and
remove it from Documentation Makefile. Update location information
for this tool. Create a new Makefile to build pcmcia. It can be built
from top level directory or from pcmcia directory:
Run make -C tools/pcmcia or cd tools/pcmcia; make
Acked-by: Dominik Brodowski <linux@dominikbrodowski.net>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/Makefile | 3 | ||||
| -rw-r--r-- | Documentation/pcmcia/.gitignore | 1 | ||||
| -rw-r--r-- | Documentation/pcmcia/Makefile | 7 | ||||
| -rw-r--r-- | Documentation/pcmcia/crc32hash.c | 32 | ||||
| -rw-r--r-- | Documentation/pcmcia/devicetable.txt | 4 |
5 files changed, 3 insertions, 44 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile index 0ddb50c3cfc4..84359654cfcb 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -1,2 +1 @@ -subdir-y := blackfin \ - pcmcia +subdir-y := blackfin diff --git a/Documentation/pcmcia/.gitignore b/Documentation/pcmcia/.gitignore deleted file mode 100644 index 53d081336757..000000000000 --- a/Documentation/pcmcia/.gitignore +++ /dev/null @@ -1 +0,0 @@ -crc32hash diff --git a/Documentation/pcmcia/Makefile b/Documentation/pcmcia/Makefile deleted file mode 100644 index 47a8fa162683..000000000000 --- a/Documentation/pcmcia/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# List of programs to build -hostprogs-y := crc32hash - -# Tell kbuild to always build the programs -always := $(hostprogs-y) - -HOSTCFLAGS_crc32hash.o += -I$(objtree)/usr/include diff --git a/Documentation/pcmcia/crc32hash.c b/Documentation/pcmcia/crc32hash.c deleted file mode 100644 index 44f8beea7260..000000000000 --- a/Documentation/pcmcia/crc32hash.c +++ /dev/null @@ -1,32 +0,0 @@ -/* crc32hash.c - derived from linux/lib/crc32.c, GNU GPL v2 */ -/* Usage example: -$ ./crc32hash "Dual Speed" -*/ - -#include <string.h> -#include <stdio.h> -#include <ctype.h> -#include <stdlib.h> - -static unsigned int crc32(unsigned char const *p, unsigned int len) -{ - int i; - unsigned int crc = 0; - while (len--) { - crc ^= *p++; - for (i = 0; i < 8; i++) - crc = (crc >> 1) ^ ((crc & 1) ? 0xedb88320 : 0); - } - return crc; -} - -int main(int argc, char **argv) { - unsigned int result; - if (argc != 2) { - printf("no string passed as argument\n"); - return -1; - } - result = crc32((unsigned char const *)argv[1], strlen(argv[1])); - printf("0x%x\n", result); - return 0; -} diff --git a/Documentation/pcmcia/devicetable.txt b/Documentation/pcmcia/devicetable.txt index 199afd100cf2..5f3e00ab54c4 100644 --- a/Documentation/pcmcia/devicetable.txt +++ b/Documentation/pcmcia/devicetable.txt @@ -27,7 +27,7 @@ pcmcia:m0149cC1ABf06pfn00fn00pa725B842DpbF1EFEE84pc0877B627pd00000000 The hex value after "pa" is the hash of product ID string 1, after "pb" for string 2 and so on. -Alternatively, you can use crc32hash (see Documentation/pcmcia/crc32hash.c) +Alternatively, you can use crc32hash (see tools/pcmcia/crc32hash.c) to determine the crc32 hash. Simply pass the string you want to evaluate as argument to this program, e.g.: -$ ./crc32hash "Dual Speed" +$ tools/pcmcia/crc32hash "Dual Speed" |