Commit 877599fd authored by Evgeniy Polyakov's avatar Evgeniy Polyakov Committed by Greg Kroah-Hartman

[PATCH] crc16: remove w1 specific comments.

Remove w1 comments from crc16.h and move
specific constants into w1_ds2433.c where they are used.
Replace %d with %zd.
Signed-off-by: default avatarEvgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 8ccc4577
...@@ -15,6 +15,10 @@ ...@@ -15,6 +15,10 @@
#include <linux/delay.h> #include <linux/delay.h>
#ifdef CONFIG_W1_F23_CRC #ifdef CONFIG_W1_F23_CRC
#include <linux/crc16.h> #include <linux/crc16.h>
#define CRC16_INIT 0
#define CRC16_VALID 0xb001
#endif #endif
#include "w1.h" #include "w1.h"
...@@ -214,7 +218,7 @@ static ssize_t w1_f23_write_bin(struct kobject *kobj, char *buf, loff_t off, ...@@ -214,7 +218,7 @@ static ssize_t w1_f23_write_bin(struct kobject *kobj, char *buf, loff_t off,
#ifdef CONFIG_W1_F23_CRC #ifdef CONFIG_W1_F23_CRC
/* can only write full blocks in cached mode */ /* can only write full blocks in cached mode */
if ((off & W1_PAGE_MASK) || (count & W1_PAGE_MASK)) { if ((off & W1_PAGE_MASK) || (count & W1_PAGE_MASK)) {
dev_err(&sl->dev, "invalid offset/count off=%d cnt=%d\n", dev_err(&sl->dev, "invalid offset/count off=%d cnt=%zd\n",
(int)off, count); (int)off, count);
return -EINVAL; return -EINVAL;
} }
......
/* /*
* crc16.h - CRC-16 routine * crc16.h - CRC-16 routine
* *
* Implements the standard CRC-16, as used with 1-wire devices: * Implements the standard CRC-16:
* Width 16 * Width 16
* Poly 0x8005 (x^16 + x^15 + x^2 + 1) * Poly 0x8005 (x^16 + x^15 + x^2 + 1)
* Init 0 * Init 0
* *
* For 1-wire devices, the CRC is stored inverted, LSB-first
*
* Example buffer with the CRC attached:
* 31 32 33 34 35 36 37 38 39 C2 44
*
* The CRC over a buffer with the CRC attached is 0xB001.
* So, if (crc16(0, buf, size) == 0xB001) then the buffer is valid.
*
* Refer to "Application Note 937: Book of iButton Standards" for details.
* http://www.maxim-ic.com/appnotes.cfm/appnote_number/937
*
* Copyright (c) 2005 Ben Gardner <bgardner@wabtec.com> * Copyright (c) 2005 Ben Gardner <bgardner@wabtec.com>
* *
* This source code is licensed under the GNU General Public License, * This source code is licensed under the GNU General Public License,
...@@ -28,9 +17,6 @@ ...@@ -28,9 +17,6 @@
#include <linux/types.h> #include <linux/types.h>
#define CRC16_INIT 0
#define CRC16_VALID 0xb001
extern u16 const crc16_table[256]; extern u16 const crc16_table[256];
extern u16 crc16(u16 crc, const u8 *buffer, size_t len); extern u16 crc16(u16 crc, const u8 *buffer, size_t len);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment