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

2009-01-21 Sebastian Huber <sebastian.huber@embedded-brains.de>

Browse Source 
* libchip/i2c/spi-sd-card.h, libchip/i2c/spi-sd-card.c: Fixed
	RTEMS_BLKDEV_CAPABILITIES ioctl which caused invalid multiple block
	writes.  Fixed integer type in device structure.
This commit is contained in:
Joel Sherrill
2009-01-21 18:08:32 +00:00
parent f29aa73c33
commit 4c18d8c3d2
3 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
c/src/ChangeLog
View File

@@ -1,3 +1,9 @@
2009-01-21 Sebastian Huber <sebastian.huber@embedded-brains.de>
* libchip/i2c/spi-sd-card.h, libchip/i2c/spi-sd-card.c: Fixed
RTEMS_BLKDEV_CAPABILITIES ioctl which caused invalid multiple block
writes. Fixed integer type in device structure.
2009-01-05 Joel Sherrill <joel.sherrill@oarcorp.com>
* libchip/serial/ns16550.c: Turn on ns16550_process() for

38
c/src/libchip/i2c/spi-sd-card.c
View File

@@ -887,26 +887,26 @@ sd_card_disk_block_write_cleanup:
static int sd_card_disk_ioctl( dev_t dev, uint32_t req, void *arg)
{
RTEMS_DEBUG_PRINT( "dev = %u, req = %u, arg = 0x08%x\n", dev, req, arg);
if (req == RTEMS_BLKIO_REQUEST) {
rtems_device_minor_number minor = rtems_filesystem_dev_minor_t( dev);
if (req == RTEMS_BLKIO_REQUEST) {
rtems_device_minor_number minor = rtems_filesystem_dev_minor_t( dev);
sd_card_driver_entry *e = &sd_card_driver_table [minor];
rtems_blkdev_request *r = (rtems_blkdev_request *) arg;
switch (r->req) {
case RTEMS_BLKDEV_REQ_READ:
return sd_card_disk_block_read( e, r);
case RTEMS_BLKDEV_REQ_WRITE:
return sd_card_disk_block_write( e, r);
case RTEMS_BLKDEV_CAPABILITIES:
*((uint32_t*) arg) = RTEMS_BLKDEV_CAP_MULTISECTOR_CONT;
return 0;
default:
errno = EBADRQC;
return -1;
}
} else {
errno = EBADRQC;
return -1;
}
rtems_blkdev_request *r = (rtems_blkdev_request *) arg;
switch (r->req) {
case RTEMS_BLKDEV_REQ_READ:
return sd_card_disk_block_read( e, r);
case RTEMS_BLKDEV_REQ_WRITE:
return sd_card_disk_block_write( e, r);
default:
errno = EBADRQC;
return -1;
}
} else if (req == RTEMS_BLKDEV_CAPABILITIES) {
*(uint32_t*) arg = RTEMS_BLKDEV_CAP_MULTISECTOR_CONT;
return 0;
} else {
errno = EBADRQC;
return -1;
}
}
static rtems_status_code sd_card_disk_init( rtems_device_major_number major, rtems_device_minor_number minor, void *arg)

2
c/src/libchip/i2c/spi-sd-card.h
View File

@@ -56,7 +56,7 @@ extern "C" {
typedef struct {
const char *device_name;
int bus;
rtems_device_minor_number bus;
rtems_libi2c_tfr_mode_t transfer_mode;
uint8_t command [SD_CARD_COMMAND_SIZE];
uint8_t response [SD_CARD_COMMAND_SIZE];