RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

corrected bug in libchip/i2c/spi-flash-m25p40

Browse Source
This commit is contained in:
Thomas Doerfler
2007-10-26 09:54:28 +00:00
parent c47890cccf
commit 7a4e8e7c8a
3 changed files with 44 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
c/src/ChangeLog
View File

@@ -1,3 +1,8 @@
2007-09-26 Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
* libchip/i2c/spi-flash-m25p40.c:
added addressing call in write function
2007-09-24 Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
* libchip/i2c/spi-flash-m25p40.c, libchip/i2c/spi-flash-m25p40.c,

42
c/src/libchip/i2c/spi-flash-m25p40.c
View File

@@ -16,8 +16,8 @@
+-----------------------------------------------------------------+
\*===============================================================*/
/*
* FIXME: currently, this driver only supports read accesses
* write/erase accesses are to be completed
* FIXME: currently, this driver only supports read/write accesses
* erase accesses are to be completed
*/
@@ -108,9 +108,17 @@ rtems_status_code spi_flash_m25p40_write
unsigned char cmdbuf[4];
int ret_cnt = 0;
/*
* FIXME: check arguments
* check arguments
*/
if (rc == RTEMS_SUCCESSFUL) {
if ((cnt <= 0) ||
(cnt > M25P40_TOTAL_SIZE) ||
(off > (M25P40_TOTAL_SIZE-cnt))) {
rc = RTEMS_INVALID_SIZE;
}
else if (buf == NULL) {
rc = RTEMS_INVALID_ADDRESS;
}
}
/*
* select device, set transfer mode, address device
@@ -126,6 +134,14 @@ rtems_status_code spi_flash_m25p40_write
RTEMS_LIBI2C_IOCTL_SET_TFRMODE,
&spi_flash_m25p40_tfr_mode);
}
/*
* address device
*/
if (rc == RTEMS_SUCCESSFUL) {
rc = rtems_libi2c_send_addr(minor,TRUE);
}
/*
* send write_enable command
*/
@@ -150,11 +166,19 @@ rtems_status_code spi_flash_m25p40_write
curr_cnt = M25P40_PAGE_SIZE - (off % M25P40_PAGE_SIZE);
}
/*
* select device, set transfer mode, address device
* select device, set transfer mode
*/
if (rc == RTEMS_SUCCESSFUL) {
rc = rtems_libi2c_send_start(minor);
}
/*
* address device
*/
if (rc == RTEMS_SUCCESSFUL) {
rc = rtems_libi2c_send_addr(minor,TRUE);
}
/*
* set transfer mode
*/
@@ -236,9 +260,17 @@ rtems_status_code spi_flash_m25p40_read
unsigned char cmdbuf[4];
int ret_cnt = 0;
/*
* FIXME: check arguments
* check arguments
*/
if (rc == RTEMS_SUCCESSFUL) {
if ((cnt <= 0) ||
(cnt > M25P40_TOTAL_SIZE) ||
(off > (M25P40_TOTAL_SIZE-cnt))) {
rc = RTEMS_INVALID_SIZE;
}
else if (buf == NULL) {
rc = RTEMS_INVALID_ADDRESS;
}
}
/*
* select device, set transfer mode, address device

4
c/src/libchip/i2c/spi-flash-m25p40.h
View File

@@ -16,8 +16,8 @@
+-----------------------------------------------------------------+
\*===============================================================*/
/*
* FIXME: currently, this driver only supports read accesses
* write/erase accesses are to be completed
* FIXME: currently, this driver only supports read/write accesses
* erase accesses are to be completed
*/