From 46011cfcbfcb32c20b811d59e6212974fc5a866d Mon Sep 17 00:00:00 2001
From: Eugene <jdevelop@gmail.com>
Date: Wed, 28 Feb 2018 14:32:13 -0500
Subject: [PATCH] MFRC522: Code review follow-up (#221)

Catch errors
Update formatting

Signed-off-by: Eugene Dzhurinsky <jdevelop@gmail.com>
---
 .../devices/mfrc522/commands/registers.go     |  2 +-
 experimental/devices/mfrc522/mfrc522.go       | 72 +++++++++----------
 2 files changed, 36 insertions(+), 38 deletions(-)

diff --git a/experimental/devices/mfrc522/commands/registers.go b/experimental/devices/mfrc522/commands/registers.go
index aff54d8..ec600a9 100644
--- a/experimental/devices/mfrc522/commands/registers.go
+++ b/experimental/devices/mfrc522/commands/registers.go
@@ -4,7 +4,7 @@
 
 package commands
 
-// Command register constants
+// Register constants
 const (
 	CommandReg    = 0x01
 	CommIEnReg    = 0x02
diff --git a/experimental/devices/mfrc522/mfrc522.go b/experimental/devices/mfrc522/mfrc522.go
index 36389cd..7d3574d 100644
--- a/experimental/devices/mfrc522/mfrc522.go
+++ b/experimental/devices/mfrc522/mfrc522.go
@@ -74,11 +74,7 @@ type Dev struct {
 	spiDev           spi.Conn
 }
 
-///////////////////////////////////////////////////////////////////////////////////////////
-//
-//							MFRC522 SPI Dev public API
-//
-///////////////////////////////////////////////////////////////////////////////////////////
+//		MFRC522 SPI Dev public API
 
 // NewSPI creates and initializes the RFID card reader attached to SPI.
 //
@@ -86,40 +82,31 @@ type Dev struct {
 // 	resetPin - reset GPIO pin.
 // 	irqPin - irq GPIO pin.
 func NewSPI(spiPort spi.Port, resetPin gpio.PinOut, irqPin gpio.PinIn) (*Dev, error) {
-
 	if resetPin == nil {
 		return nil, wrapf("reset pin is not set")
 	}
 	if irqPin == nil {
 		return nil, wrapf("IRQ pin is not set")
 	}
-
 	spiDev, err := spiPort.Connect(10000000, spi.Mode0, 8)
 	if err != nil {
 		return nil, err
 	}
-
-	dev := &Dev{
-		spiDev:           spiDev,
-		operationTimeout: 30 * time.Second,
-	}
-
 	if err := resetPin.Out(gpio.High); err != nil {
 		return nil, err
 	}
-
-	dev.resetPin = resetPin
-
 	if err := irqPin.In(gpio.PullUp, gpio.FallingEdge); err != nil {
 		return nil, err
 	}
-
-	dev.irqPin = irqPin
-
+	dev := &Dev{
+		spiDev:           spiDev,
+		operationTimeout: 30 * time.Second,
+		irqPin:           irqPin,
+		resetPin:         resetPin,
+	}
 	if err := dev.Init(); err != nil {
 		return nil, err
 	}
-
 	return dev, nil
 }
 
@@ -186,19 +173,33 @@ func (r *Dev) CardWrite(command byte, data []byte) ([]byte, int, error) {
 		irqWait = 0x30
 	}
 
-	r.devWrite(commands.CommIEnReg, irqEn|0x80)
-	r.clearBitmask(commands.CommIrqReg, 0x80)
-	r.setBitmask(commands.FIFOLevelReg, 0x80)
-	r.devWrite(commands.CommandReg, commands.PCD_IDLE)
+	if err := r.devWrite(commands.CommIEnReg, irqEn|0x80); err != nil {
+		return nil, -1, err
+	}
+	if err := r.clearBitmask(commands.CommIrqReg, 0x80); err != nil {
+		return nil, -1, err
+	}
+	if err := r.setBitmask(commands.FIFOLevelReg, 0x80); err != nil {
+		return nil, -1, err
+	}
+	if err := r.devWrite(commands.CommandReg, commands.PCD_IDLE); err != nil {
+		return nil, -1, err
+	}
 
 	for _, v := range data {
-		r.devWrite(commands.FIFODataReg, v)
+		if err := r.devWrite(commands.FIFODataReg, v); err != nil {
+			return nil, -1, err
+		}
 	}
 
-	r.devWrite(commands.CommandReg, command)
+	if err := r.devWrite(commands.CommandReg, command); err != nil {
+		return nil, -1, err
+	}
 
 	if command == commands.PCD_TRANSCEIVE {
-		r.setBitmask(commands.BitFramingReg, 0x80)
+		if err := r.setBitmask(commands.BitFramingReg, 0x80); err != nil {
+			return nil, -1, err
+		}
 	}
 
 	i := 2000
@@ -214,7 +215,9 @@ func (r *Dev) CardWrite(command byte, data []byte) ([]byte, int, error) {
 		}
 	}
 
-	r.clearBitmask(commands.BitFramingReg, 0x80)
+	if err := r.clearBitmask(commands.BitFramingReg, 0x80); err != nil {
+		return nil, -1, err
+	}
 
 	if i == 0 {
 		return nil, -1, wrapf("can't read data after 2000 loops")
@@ -451,10 +454,9 @@ func (r *Dev) WriteBlock(auth byte, sector int, block int, data [16]byte, key []
 	return r.write(calcBlockAddress(sector, block%3), data[:])
 }
 
-/*
-ReadSectorTrail reads the sector trail (the last sector that contains the sector access bits)
-	sector - the sector number to read the data from.
-*/
+// ReadSectorTrail reads the sector trail (the last sector that contains the sector access bits)
+//
+// 	sector - the sector number to read the data from.
 func (r *Dev) ReadSectorTrail(sector int) ([]byte, error) {
 	return r.read(calcBlockAddress(sector&0xFF, 3))
 }
@@ -582,11 +584,7 @@ func (r *Dev) String() string {
 		r.spiDev, r.resetPin.Name(), r.irqPin.Name())
 }
 
-///////////////////////////////////////////////////////////////////////////////////////////
-//
-//							MFRC522 SPI Dev private/helper functions
-//
-///////////////////////////////////////////////////////////////////////////////////////////
+//		MFRC522 SPI Dev private/helper functions
 
 func (ba *BlocksAccess) getBits(bitNum uint) byte {
 	shift := bitNum - 1