Changeset f031251c in rtems for c/src/libchip

Timestamp:

Aug 2, 2008, 6:26:29 AM (11 years ago)

Author:

Chris Johns <chrisj@…>

Branches:

4.10, 4.11, 4.9, master

Children:

c0cc985

Parents:

2eb89ad

Message:

2008-08-02 Chris Johns <chrisj@…>

• libchip/i2c/spi-sd-card.c, libchip/ide/ata.c: Remove rtems_blkdev_request count and start references. Use RTEMS_BLKDEV_START_BLOCK.

Location:

c/src/libchip

Files:

• i2c/spi-sd-card.c (modified) (8 diffs)
• ide/ata.c (modified) (9 diffs)

c/src/libchip/i2c/spi-sd-card.c

@@ -563 +563 @@
         rtems_status_code sc = RTEMS_SUCCESSFUL;
         int rv = 0;
-        uint32_t start_address = r->start << e->block_size_shift;
+        uint32_t start_address = RTEMS_BLKDEV_START_BLOCK (r) << e->block_size_shift;
         uint32_t i = 0;
 
-        DEBUG_PRINT( "start = %u, count = %u, bufnum = %u\n", r->start, r->count, r->bufnum);
+        DEBUG_PRINT( "start = %u, bufnum = %u\n", r->start, r->bufnum);
 
 #ifdef DEBUG
         /* Check request */
-        if (r->count != r->bufnum) {
-                SYSLOG_ERROR( "Block count and buffer number are not equal");
-                return -RTEMS_INTERNAL_ERROR;
-        } else if (r->start >= e->block_number) {
+  if (r->bufs[0].block >= e->block_number) {
                 SYSLOG_ERROR( "Start block number out of range");
                 return -RTEMS_INTERNAL_ERROR;
-        } else if (r->count > e->block_number - r->start) {
+        } else if (r->bufnum > e->block_number - RTEMS_BLKDEV_START_BLOCK (r)) {
                 SYSLOG_ERROR( "Block count out of range");
                 return -RTEMS_INTERNAL_ERROR;
@@ -586 +583 @@
         CLEANUP_SCRV( sc, rv, sd_card_disk_block_read_cleanup, "Start");
 
-        if (r->count == 1) {
+        if (r->bufnum == 1) {
 #ifdef DEBUG
                 /* Check buffer */
@@ -606 +603 @@
 
                 /* Multiple block read */
-                for (i = 0; i < r->count; ++i) {
+                for (i = 0; i < r->bufnum; ++i) {
 #ifdef DEBUG
                         /* Check buffer */
@@ -653 +650 @@
         rtems_status_code sc = RTEMS_SUCCESSFUL;
         int rv = 0;
-        uint32_t start_address = r->start << e->block_size_shift;
+        uint32_t start_address = RTEMS_BLKDEV_START_BLOCK (r) << e->block_size_shift;
         uint32_t i = 0;
 
@@ -660 +657 @@
 #ifdef DEBUG
         /* Check request */
-        if (r->count != r->bufnum) {
-                SYSLOG_ERROR( "Block count and buffer number are not equal");
-                return -RTEMS_INTERNAL_ERROR;
-        } else if (r->start >= e->block_number) {
+  if (r->bufs[0].block >= e->block_number) {
                 SYSLOG_ERROR( "Start block number out of range");
                 return -RTEMS_INTERNAL_ERROR;
-        } else if (r->count > e->block_number - r->start) {
+        } else if (r->bufnum > e->block_number - RTEMS_BLKDEV_START_BLOCK (r)) {
                 SYSLOG_ERROR( "Block count out of range");
                 return -RTEMS_INTERNAL_ERROR;
@@ -676 +670 @@
         CLEANUP_SCRV( sc, rv, sd_card_disk_block_write_cleanup, "Start");
 
-        if (r->count == 1) {
+        if (r->bufnum == 1) {
 #ifdef DEBUG
                 /* Check buffer */
@@ -696 +690 @@
 
                 /* Multiple block write */
-                for (i = 0; i < r->count; ++i) {
+                for (i = 0; i < r->bufnum; ++i) {
 #ifdef DEBUG
                         /* Check buffer */
@@ -759 +753 @@
                         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;

c/src/libchip/ide/ata.c

@@ -27 +27 @@
 #include "ata_internal.h"
 #include <libchip/ata.h>
-//#define DEBUG
+/* #define DEBUG */
 
 #ifdef DEBUG
@@ -212 +212 @@
 
     areq->breq = req;
-    areq->cnt = req->count;
+    areq->cnt = req->bufnum;
     areq->cbuf = 0;
     areq->pos = 0;
@@ -240 +240 @@
 #ifdef DEBUG
             printf("ata_io_data_request: type: READ: %d, %d\n",
-                   req->bufs[0].block, req->count);
+                   req->bufs[0].block, req->bufnum);
 #endif            
             areq->type = ATA_COMMAND_TYPE_PIO_IN;
@@ -252 +252 @@
             areq->regs.regs[IDE_REGISTER_COMMAND] =
                 ((ATA_DEV_INFO(ctrl_minor, dev).max_multiple) &&
-                 (req->count > 1) &&
+                 (req->bufnum > 1) &&
                  (ATA_DEV_INFO(ctrl_minor, dev).current_multiple > 1)) ?
                  ATA_COMMAND_READ_MULTIPLE :
@@ -261 +261 @@
 #ifdef DEBUG
             printf("ata_io_data_request: type: WRITE: %d, %d\n",
-                   req->bufs[0].block, req->count);
+                   req->bufs[0].block, req->bufnum);
 #endif            
             areq->type = ATA_COMMAND_TYPE_PIO_OUT;
@@ -273 +273 @@
             areq->regs.regs[IDE_REGISTER_COMMAND] =
               ((ATA_DEV_INFO(ctrl_minor, dev).max_multiple) &&
-               (req->count > 1) &&
+               (req->bufnum > 1) &&
                (ATA_DEV_INFO(ctrl_minor, dev).current_multiple > 1)) ?
                ATA_COMMAND_WRITE_MULTIPLE :
@@ -313 +313 @@
 
     /* fill sector count register */
-    areq->regs.regs[IDE_REGISTER_SECTOR_COUNT] = areq->breq->count;
+    areq->regs.regs[IDE_REGISTER_SECTOR_COUNT] = areq->breq->bufnum;
 
     /* add request to the queue of awaiting requests to the controller */
@@ -1197 +1197 @@
     breq.req.done_arg = &breq;
     breq.req.bufnum = 1;
-    breq.req.count = 1;
     breq.req.bufs[0].length = ATA_SECTOR_SIZE;
     breq.req.bufs[0].buffer = buffer;
@@ -1366 +1365 @@
             areq.breq = (rtems_blkdev_request *)&breq;
 
-            areq.cnt = breq.req.count;
+            areq.cnt = breq.req.bufnum;
 
             areq.regs.regs[IDE_REGISTER_DEVICE_HEAD] |=