From 3eac3f5ab07a7dd61cb1db5ba78c89d22098051b Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Fri, 5 Oct 2018 17:01:38 +0000 Subject: Removed leftovers. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12324 110e8d01-0319-4d1e-a829-52ad28d1bb01 --- os/hal/lib/complex/serial_nor/devices/micron_n25q/flash_device.h | 4 +--- os/hal/lib/complex/serial_nor/serial_nor.c | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'os/hal/lib/complex/serial_nor') diff --git a/os/hal/lib/complex/serial_nor/devices/micron_n25q/flash_device.h b/os/hal/lib/complex/serial_nor/devices/micron_n25q/flash_device.h index 59db2c30d..8ddf57ae0 100644 --- a/os/hal/lib/complex/serial_nor/devices/micron_n25q/flash_device.h +++ b/os/hal/lib/complex/serial_nor/devices/micron_n25q/flash_device.h @@ -26,8 +26,6 @@ #ifndef FLASH_DEVICE_H #define FLASH_DEVICE_H -#include "hal_jesd216_flash.h" - /*===========================================================================*/ /* Driver constants. */ /*===========================================================================*/ @@ -134,7 +132,7 @@ flash_error_t snor_device_verify_erase(SNORDriver *devp, flash_error_t snor_device_query_erase(SNORDriver *devp, uint32_t *msec); flash_error_t snor_device_read_sfdp(SNORDriver *devp, flash_offset_t offset, size_t n, uint8_t *rp); -#if JESD216_BUS_MODE != JESD216_BUS_MODE_SPI +#if SNOR_BUS_MODE != SNOR_BUS_MODE_SPI void snor_activate_xip(SNORDriver *devp); void snor_reset_xip(SNORDriver *devp); #endif diff --git a/os/hal/lib/complex/serial_nor/serial_nor.c b/os/hal/lib/complex/serial_nor/serial_nor.c index c4f3523bd..dca409a80 100644 --- a/os/hal/lib/complex/serial_nor/serial_nor.c +++ b/os/hal/lib/complex/serial_nor/serial_nor.c @@ -799,7 +799,7 @@ void snorStop(SNORDriver *devp) { bus_acquire(devp->config->busp, devp->config->buscfg); /* Stopping bus device.*/ - jesd216_stop(devp->config->busp); + bus_stop(devp->config->busp); /* Deleting current configuration.*/ devp->config = NULL; -- cgit v1.2.3