From: David Fries <david@fries.net>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org, Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Subject: [PATCH 27/30] W1: ds2490.c magic number work
Date: Mon, 28 Jul 2008 21:28:08 -0500 [thread overview]
Message-ID: <20080729022808.GA24452@spacedout.fries.net> (raw)
In-Reply-To: <20080729020433.GA24424@spacedout.fries.net>
[-- Attachment #1: Type: text/plain, Size: 1757 bytes --]
This replaces some magic numbers with marcos and corrects one marco.
Signed-off-by: David Fries <david@fries.net>
Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
---
drivers/w1/masters/ds2490.c | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/drivers/w1/masters/ds2490.c b/drivers/w1/masters/ds2490.c
index 754a4bb..d9e07d6 100644
--- a/drivers/w1/masters/ds2490.c
+++ b/drivers/w1/masters/ds2490.c
@@ -88,7 +88,7 @@
#define COMM_DT 0x2000
#define COMM_SPU 0x1000
#define COMM_F 0x0800
-#define COMM_NTP 0x0400
+#define COMM_NTF 0x0400
#define COMM_ICP 0x0200
#define COMM_RST 0x0100
@@ -440,7 +440,7 @@ static int ds_wait_status(struct ds_device *dev, struct ds_status *st)
printk("\n");
}
#endif
- } while(!(buf[0x08] & 0x20) && !(err < 0) && ++count < 100);
+ } while (!(buf[0x08] & ST_IDLE) && !(err < 0) && ++count < 100);
if (err >= 16 && st->status & ST_EPOF) {
printk(KERN_INFO "Resetting device after ST_EPOF.\n");
@@ -470,8 +470,16 @@ static int ds_reset(struct ds_device *dev)
{
int err;
- //err = ds_send_control(dev, COMM_1_WIRE_RESET | COMM_F | COMM_IM | COMM_SE, SPEED_FLEXIBLE);
- err = ds_send_control(dev, 0x43, SPEED_NORMAL);
+ /* Other potentionally interesting flags for reset.
+ *
+ * COMM_NTF: Return result register feedback. This could be used to
+ * detect some conditions such as short, alarming presence, or
+ * detect if a new device was detected.
+ *
+ * COMM_SE which allows SPEED_NORMAL, SPEED_FLEXIBLE, SPEED_OVERDRIVE:
+ * Select the data transfer rate.
+ */
+ err = ds_send_control(dev, COMM_1_WIRE_RESET | COMM_IM, SPEED_NORMAL);
if (err)
return err;
--
1.4.4.4
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
next prev parent reply other threads:[~2008-07-29 2:28 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-29 2:04 [PATCH 0/30] W1: w1 core fixes, ds2490 updates, strong pullup David Fries
2008-07-29 2:10 ` [PATCH 1/30] W1: fix deadlocks and remove w1_control_thread David Fries
2008-07-29 2:12 ` [PATCH 2/30] W1: abort search early on on exit David Fries
2008-07-29 2:13 ` [PATCH 3/30] W1: don't delay search start David Fries
2008-07-29 2:14 ` [PATCH 4/30] W1: w1_process, block or sleep David Fries
2008-07-29 2:14 ` [PATCH 5/30] W1: feature, enable hardware strong pullup David Fries
2008-07-29 23:21 ` Andrew Morton
2008-07-29 2:15 ` [PATCH 6/30] W1: feature, w1_therm.c use strong pullup and documentation David Fries
2008-07-29 2:17 ` [PATCH 7/30] W1: be able to manually add and remove slaves David Fries
2008-07-29 2:18 ` [PATCH 8/30] W1: recode w1_slave_found logic David Fries
2008-07-29 2:19 ` [PATCH 9/30] W1: new module parameter search_count David Fries
2008-07-29 2:20 ` [PATCH 10/30] W1: Document add, remove, search_count, and pullup David Fries
2008-07-29 2:21 ` [PATCH 11/30] W1: w1_slave_read_id read bug, use device_attribute David Fries
2008-07-29 2:21 ` [PATCH 12/30] W1: w1_therm fix user buffer overflow and cat David Fries
2008-07-29 2:21 ` [PATCH 13/30] W1: w1_family, remove unused variable need_exit David Fries
2008-07-29 2:22 ` [PATCH 14/30] W1: w1_therm consistent mutex access code cleanup David Fries
2008-07-29 2:23 ` [PATCH 15/30] W1: w1_int.c use first available master number David Fries
2008-07-29 2:23 ` [PATCH 16/30] W1: w1.c s/printk/dev_dbg/ David Fries
2008-07-29 2:24 ` [PATCH 17/30] W1: w1_io.c reset comments and msleep David Fries
2008-07-29 2:24 ` [PATCH 18/30] W1: ds1wm.c msleep for reset David Fries
2008-07-29 2:25 ` [PATCH 19/30] W1: ds2490.c correct print message David Fries
2008-07-29 2:25 ` [PATCH 20/30] W1: ds2490.c add support for strong pullup David Fries
2008-07-29 2:25 ` [PATCH 21/30] W1: ds2490.c ds_write_bit, grouping error, disable readback David Fries
2008-07-29 2:25 ` [PATCH 22/30] W1: ds2490.c disable bit read and write David Fries
2008-07-29 2:26 ` [PATCH 23/30] W1: ds2490.c simplify and fix ds_touch_bit David Fries
2008-07-29 2:26 ` [PATCH 24/30] W1: ds2490.c ds_dump_status rework David Fries
2008-07-29 2:26 ` [PATCH 25/30] W1: ds2490.c ds_reset remove ds_wait_status David Fries
2008-07-29 2:27 ` [PATCH 26/30] W1: ds2490.c reset ds2490 in init David Fries
2008-07-29 2:28 ` David Fries [this message]
2008-07-29 2:28 ` [PATCH 28/30] W1: ds2490.c ds_write_block remove extra ds_wait_status David Fries
2008-07-29 2:29 ` [PATCH 29/30] W1: Documentation/w1/masters/ds2490 update David Fries
2008-07-29 2:30 ` [PATCH 30/30] W1: ds2490.c optimize ds_set_pullup David Fries
2008-07-29 23:13 ` [PATCH 0/30] W1: w1 core fixes, ds2490 updates, strong pullup Andrew Morton
2008-07-31 2:37 ` David Fries
2008-07-31 3:03 ` Andrew Morton
2008-07-31 2:47 ` [PATCH 1/30] W1: fix deadlocks and remove w1_control_thread David Fries
2008-07-31 2:48 ` [PATCH 2/30] W1: abort search early on on exit David Fries
2008-07-31 2:48 ` [PATCH 3/30] W1: don't delay search start David Fries
2008-07-31 2:48 ` [PATCH 4/30] W1: w1_process, block or sleep David Fries
2008-07-31 2:48 ` [PATCH 5/30] W1: feature, enable hardware strong pullup David Fries
2008-07-31 2:48 ` [PATCH 6/30] W1: feature, w1_therm.c use strong pullup and documentation David Fries
2008-07-31 2:48 ` [PATCH 7/30] W1: be able to manually add and remove slaves David Fries
2008-07-31 2:48 ` [PATCH 8/30] W1: recode w1_slave_found logic David Fries
2008-07-31 2:48 ` [PATCH 9/30] W1: new module parameter search_count David Fries
2008-07-31 2:49 ` [PATCH 10/30] W1: Document add, remove, search_count, and pullup David Fries
2008-07-31 2:49 ` [PATCH 11/30] W1: w1_slave_read_id read bug, use device_attribute David Fries
2008-07-31 2:49 ` [PATCH 12/30] W1: w1_therm fix user buffer overflow and cat David Fries
2008-07-31 2:49 ` [PATCH 13/30] W1: w1_family, remove unused variable need_exit David Fries
2008-07-31 2:49 ` [PATCH 14/30] W1: w1_therm consistent mutex access code cleanup David Fries
2008-07-31 2:49 ` [PATCH 15/30] W1: w1_int.c use first available master number David Fries
2008-07-31 2:49 ` [PATCH 16/30] W1: w1.c s/printk/dev_dbg/ David Fries
2008-07-31 2:49 ` [PATCH 17/30] W1: w1_io.c reset comments and msleep David Fries
2008-07-31 2:49 ` [PATCH 18/30] W1: ds1wm.c msleep for reset David Fries
2008-07-31 2:49 ` [PATCH 19/30] W1: ds2490.c correct print message David Fries
2008-07-31 2:49 ` [PATCH 20/30] W1: ds2490.c add support for strong pullup David Fries
2008-07-31 2:50 ` [PATCH 21/30] W1: ds2490.c ds_write_bit, grouping error, disable readback David Fries
2008-07-31 2:50 ` [PATCH 22/30] W1: ds2490.c disable bit read and write David Fries
2008-07-31 2:50 ` [PATCH 23/30] W1: ds2490.c simplify and fix ds_touch_bit David Fries
2008-07-31 2:50 ` [PATCH 24/30] W1: ds2490.c ds_dump_status rework David Fries
2008-07-31 2:50 ` [PATCH 25/30] W1: ds2490.c ds_reset remove ds_wait_status David Fries
2008-07-31 2:50 ` [PATCH 26/30] W1: ds2490.c reset ds2490 in init David Fries
2008-07-31 2:50 ` [PATCH 27/30] W1: ds2490.c magic number work David Fries
2008-07-31 2:50 ` [PATCH 28/30] W1: ds2490.c ds_write_block remove extra ds_wait_status David Fries
2008-07-31 2:50 ` [PATCH 29/30] W1: Documentation/w1/masters/ds2490 update David Fries
2008-07-31 2:50 ` [PATCH 30/30] W1: ds2490.c optimize ds_set_pullup David Fries
-- strict thread matches above, loose matches on Subject: below --
2008-07-11 13:51 w1 updates Evgeniy Polyakov
2008-07-11 13:51 ` [PATCH 27/30] W1: ds2490.c magic number work Evgeniy Polyakov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080729022808.GA24452@spacedout.fries.net \
--to=david@fries.net \
--cc=akpm@linux-foundation.org \
--cc=johnpol@2ka.mipt.ru \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox