Skip to content

Commit

Permalink
[PATCH] crc16: remove w1 specific comments.
Browse files Browse the repository at this point in the history
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: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Evgeniy Polyakov authored and Linus Torvalds committed Sep 12, 2005
1 parent 26cda98 commit f24ec7f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 16 deletions.
6 changes: 5 additions & 1 deletion drivers/w1/w1_ds2433.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
#include <linux/delay.h>
#ifdef CONFIG_W1_F23_CRC
#include <linux/crc16.h>

#define CRC16_INIT 0
#define CRC16_VALID 0xb001

#endif

#include "w1.h"
Expand Down Expand Up @@ -214,7 +218,7 @@ static ssize_t w1_f23_write_bin(struct kobject *kobj, char *buf, loff_t off,
#ifdef CONFIG_W1_F23_CRC
/* can only write full blocks in cached mode */
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);
return -EINVAL;
}
Expand Down
16 changes: 1 addition & 15 deletions include/linux/crc16.h
Original file line number Diff line number Diff line change
@@ -1,22 +1,11 @@
/*
* crc16.h - CRC-16 routine
*
* Implements the standard CRC-16, as used with 1-wire devices:
* Implements the standard CRC-16:
* Width 16
* Poly 0x8005 (x^16 + x^15 + x^2 + 1)
* 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>
*
* This source code is licensed under the GNU General Public License,
Expand All @@ -28,9 +17,6 @@

#include <linux/types.h>

#define CRC16_INIT 0
#define CRC16_VALID 0xb001

extern u16 const crc16_table[256];

extern u16 crc16(u16 crc, const u8 *buffer, size_t len);
Expand Down

0 comments on commit f24ec7f

Please sign in to comment.