Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19e7184f authored by David Fries's avatar David Fries Committed by Linus Torvalds
Browse files

W1: ds2490.c magic number work 



This replaces some magic numbers with marcos and corrects one marco.

Signed-off-by: default avatarDavid Fries <david@fries.net>
Signed-off-by: default avatarEvgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e464af24

drivers/w1/masters/ds2490.c

+12 −4
Original line number Diff line number Diff line
@@ -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;