diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2016-06-08 13:53:15 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2016-06-08 13:53:15 +0000 |
| commit | 0f5c1e4702079a0c02bb42690b6861f4f2d4b69c (patch) | |
| tree | 89176d4d7f49918a709943a2b70309c3ec39dfba | |
| parent | cccda4b224a16e7a0793a8c6dabbeaba3090b942 (diff) | |
| download | ChibiOS-0f5c1e4702079a0c02bb42690b6861f4f2d4b69c.tar.gz ChibiOS-0f5c1e4702079a0c02bb42690b6861f4f2d4b69c.tar.bz2 ChibiOS-0f5c1e4702079a0c02bb42690b6861f4f2d4b69c.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9604 35acf78f-673a-0410-8e92-d51de3d6d3f4
| -rw-r--r-- | os/hal/lib/peripherals/flash/hal_jesd216_flash.c | 2 | ||||
| -rw-r--r-- | os/hal/src/hal_serial.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/os/hal/lib/peripherals/flash/hal_jesd216_flash.c b/os/hal/lib/peripherals/flash/hal_jesd216_flash.c index af7823ac8..cd422f53b 100644 --- a/os/hal/lib/peripherals/flash/hal_jesd216_flash.c +++ b/os/hal/lib/peripherals/flash/hal_jesd216_flash.c @@ -332,7 +332,7 @@ void jesd216_cmd_addr_dummy_receive(BUSDriver *busp, #if ((JESD216_BUS_MODE != JESD216_BUS_MODE_SPI) && \
(JESD216_SHARED_BUS == TRUE)) || defined(__DOXYGEN__)
-void jesd216_bus_acquire(BUSDriver *busp, BUSConfig *config) {
+void jesd216_bus_acquire(BUSDriver *busp, const BUSConfig *config) {
(void)config;
diff --git a/os/hal/src/hal_serial.c b/os/hal/src/hal_serial.c index 5439245ed..76d33bf03 100644 --- a/os/hal/src/hal_serial.c +++ b/os/hal/src/hal_serial.c @@ -175,8 +175,7 @@ void sdStop(SerialDriver *sdp) { "invalid state");
sd_lld_stop(sdp);
- sdp->config = NULL;
- sdp->state = SD_STOP;
+ sdp->state = SD_STOP;
oqResetI(&sdp->oqueue);
iqResetI(&sdp->iqueue);
osalOsRescheduleS();
|