Revert "Merge pull request #7 from ZaparooProject/fix-deadlocks"

This reverts commit a6e5239, reversing
changes made to 583c8d6.

Author: wizzomafizzo

.github/workflows/ci.yml

@@ -39,10 +39,7 @@ jobs:
       run: go mod download
 
     - name: Run tests
-      run: go test -v -race -timeout 60s ./...
-      
-    - name: Run deadlock detection tests
-      run: go test -v -timeout 30s -tags deadlock ./...
+      run: go test -v -race ./...
 
   lint:
     runs-on: ubuntu-latest

.golangci.yml

@@ -56,8 +56,6 @@ linters:
         - diagnostic
         - style
         - performance
-    staticcheck:
-      checks: ["all", "SA2003", "SA6002", "SA6005"]
     gocyclo:
       min-complexity: 15
     funlen:

Makefile

@@ -26,8 +26,7 @@ readtag:
 # Run tests
 test:
 	@echo "Running tests..."
-	$(GOTEST) -v -race -timeout 60s -coverprofile=coverage.txt -covermode=atomic ./...
-
+	$(GOTEST) -v -race -coverprofile=coverage.txt -covermode=atomic ./...
 
 # Run tests with coverage report
 coverage: test

cmd/nfctest/types.go

@@ -27,7 +27,7 @@ import (
 	"github.com/ZaparooProject/go-pn532"
 )
 
-// Mode represents the operating modes for NFC testing
+// Operating modes
 type Mode int
 
 const (

detection/detector.go

@@ -18,7 +18,6 @@
 // along with go-pn532; if not, write to the Free Software Foundation,
 // Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-// Package detection provides device detection and management functionality for PN532 devices
 package detection
 
 import (

detection/i2c/detect_linux.go

@@ -1,6 +1,5 @@
 //go:build linux
 
-// Package i2c provides I2C device detection functionality for Linux systems
 package i2c
 
 import (

detection/spi/detector.go

@@ -18,7 +18,6 @@
 // along with go-pn532; if not, write to the Free Software Foundation,
 // Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-// Package spi provides SPI device detection and management functionality
 package spi
 
 import (

detection/uart/detector.go

@@ -18,7 +18,6 @@
 // along with go-pn532; if not, write to the Free Software Foundation,
 // Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-// Package uart provides UART device detection functionality
 package uart
 
 import (

internal/frame/constants.go

@@ -18,7 +18,6 @@
 // along with go-pn532; if not, write to the Free Software Foundation,
 // Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-// Package frame provides frame manipulation and protocol constants for PN532 communication
 package frame
 
 // Frame direction constants - these indicate the direction of data flow

mifare.go

@@ -727,9 +727,9 @@ func (t *MIFARETag) clearRemainingBlocks(startBlock uint8) error {
 func (t *MIFARETag) ResetAuthState() error {
 	// SECURITY: Thread-safe state clearing
 	t.authMutex.Lock()
-	defer t.authMutex.Unlock()
 	t.lastAuthSector = -1
 	t.lastAuthKeyType = 0
+	t.authMutex.Unlock()
 
 	// Force PN532 to reset by attempting to re-detect the tag
 	// This clears any internal authentication state in the PN532 chip
@@ -769,20 +769,18 @@ func (t *MIFARETag) Authenticate(sector uint8, keyType byte, key []byte) error {
 	_, err := t.device.SendDataExchange(cmd)
 	if err != nil {
 		// SECURITY: Thread-safe state clearing on failure
-		func() {
-			t.authMutex.Lock()
-			defer t.authMutex.Unlock()
-			t.lastAuthSector = -1
-			t.lastAuthKeyType = 0
-		}()
+		t.authMutex.Lock()
+		t.lastAuthSector = -1
+		t.lastAuthKeyType = 0
+		t.authMutex.Unlock()
 		return fmt.Errorf("authentication failed: %w", err)
 	}
 
 	// SECURITY: Thread-safe state update on success
 	t.authMutex.Lock()
-	defer t.authMutex.Unlock()
 	t.lastAuthSector = int(sector)
 	t.lastAuthKeyType = keyType
+	t.authMutex.Unlock()
 
 	return nil
 }
@@ -804,12 +802,10 @@ func (t *MIFARETag) AuthenticateRobust(sector uint8, keyType byte, key []byte) e
 	// If standard auth failed, try Chinese clone unlock sequences
 	if t.tryChineseCloneUnlock(sector) {
 		// Clone unlock successful, tag is accessible without auth
-		func() {
-			t.authMutex.Lock()
-			defer t.authMutex.Unlock()
-			t.lastAuthSector = int(sector)
-			t.lastAuthKeyType = keyType
-		}()
+		t.authMutex.Lock()
+		t.lastAuthSector = int(sector)
+		t.lastAuthKeyType = keyType
+		t.authMutex.Unlock()
 		return nil
 	}
 
@@ -878,12 +874,10 @@ func (t *MIFARETag) applyRetryStrategy(level retryLevel, _ error) error {
 		}
 
 		// Clear authentication state
-		func() {
-			t.authMutex.Lock()
-			defer t.authMutex.Unlock()
-			t.lastAuthSector = -1
-			t.lastAuthKeyType = 0
-		}()
+		t.authMutex.Lock()
+		t.lastAuthSector = -1
+		t.lastAuthKeyType = 0
+		t.authMutex.Unlock()
 
 		return nil
 
@@ -899,12 +893,10 @@ func (t *MIFARETag) applyRetryStrategy(level retryLevel, _ error) error {
 			time.Sleep(50 * time.Millisecond)
 		}
 
-		func() {
-			t.authMutex.Lock()
-			defer t.authMutex.Unlock()
-			t.lastAuthSector = -1
-			t.lastAuthKeyType = 0
-		}()
+		t.authMutex.Lock()
+		t.lastAuthSector = -1
+		t.lastAuthKeyType = 0
+		t.authMutex.Unlock()
 
 		return nil