Skip to content

Commit cdee64c

Browse files
committed
remove unnecessary locks
1 parent d4dd33d commit cdee64c

File tree

1 file changed

+0
-16
lines changed

1 file changed

+0
-16
lines changed

cores/esp32/esp32-hal-spi.c

-16
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,8 @@ void spiAttachSCK(spi_t * spi, int8_t sck)
6969
sck = 6;
7070
}
7171
}
72-
SPI_MUTEX_LOCK();
7372
pinMode(sck, OUTPUT);
7473
pinMatrixOutAttach(sck, SPI_CLK_IDX(spi->num), false, false);
75-
SPI_MUTEX_UNLOCK();
7674
}
7775

7876
void spiAttachMISO(spi_t * spi, int8_t miso)
@@ -109,10 +107,8 @@ void spiAttachMOSI(spi_t * spi, int8_t mosi)
109107
mosi = 8;
110108
}
111109
}
112-
SPI_MUTEX_LOCK();
113110
pinMode(mosi, OUTPUT);
114111
pinMatrixOutAttach(mosi, SPI_MOSI_IDX(spi->num), false, false);
115-
SPI_MUTEX_UNLOCK();
116112
}
117113

118114
void spiDetachSCK(spi_t * spi, int8_t sck)
@@ -129,10 +125,8 @@ void spiDetachSCK(spi_t * spi, int8_t sck)
129125
sck = 6;
130126
}
131127
}
132-
SPI_MUTEX_LOCK();
133128
pinMatrixOutDetach(sck, false, false);
134129
pinMode(sck, INPUT);
135-
SPI_MUTEX_UNLOCK();
136130
}
137131

138132
void spiDetachMISO(spi_t * spi, int8_t miso)
@@ -149,10 +143,8 @@ void spiDetachMISO(spi_t * spi, int8_t miso)
149143
miso = 7;
150144
}
151145
}
152-
SPI_MUTEX_LOCK();
153146
pinMatrixInDetach(SPI_MISO_IDX(spi->num), false, false);
154147
pinMode(miso, INPUT);
155-
SPI_MUTEX_UNLOCK();
156148
}
157149

158150
void spiDetachMOSI(spi_t * spi, int8_t mosi)
@@ -169,10 +161,8 @@ void spiDetachMOSI(spi_t * spi, int8_t mosi)
169161
mosi = 8;
170162
}
171163
}
172-
SPI_MUTEX_LOCK();
173164
pinMatrixOutDetach(mosi, false, false);
174165
pinMode(mosi, INPUT);
175-
SPI_MUTEX_UNLOCK();
176166
}
177167

178168
void spiAttachSS(spi_t * spi, uint8_t cs_num, int8_t ss)
@@ -193,11 +183,9 @@ void spiAttachSS(spi_t * spi, uint8_t cs_num, int8_t ss)
193183
ss = 11;
194184
}
195185
}
196-
SPI_MUTEX_LOCK();
197186
pinMode(ss, OUTPUT);
198187
pinMatrixOutAttach(ss, SPI_SS_IDX(spi->num, cs_num), false, false);
199188
spiEnableSSPins(spi, (1 << cs_num));
200-
SPI_MUTEX_UNLOCK();
201189
}
202190

203191
void spiDetachSS(spi_t * spi, int8_t ss)
@@ -214,10 +202,8 @@ void spiDetachSS(spi_t * spi, int8_t ss)
214202
ss = 11;
215203
}
216204
}
217-
SPI_MUTEX_LOCK();
218205
pinMatrixOutDetach(ss, false, false);
219206
pinMode(ss, INPUT);
220-
SPI_MUTEX_UNLOCK();
221207
}
222208

223209
void spiEnableSSPins(spi_t * spi, uint8_t cs_mask)
@@ -287,9 +273,7 @@ uint32_t spiGetClockDiv(spi_t * spi)
287273
if(!spi) {
288274
return 0;
289275
}
290-
SPI_MUTEX_LOCK();
291276
return spi->dev->clock.val;
292-
SPI_MUTEX_UNLOCK();
293277
}
294278

295279
void spiSetClockDiv(spi_t * spi, uint32_t clockDiv)

0 commit comments

Comments
 (0)