Changeset a100457 in rtems

Timestamp:

08/22/17 10:28:10 (6 years ago)

Author:

Daniel Hellstrom <daniel@…>

Branches:

4.11

Children:

63c6b06f

Parents:

55d9d8c

git-author:

Daniel Hellstrom <daniel@…> (08/22/17 10:28:10)

git-committer:

Chris Johns <chrisj@…> (10/01/20 01:35:03)

Message:

leon,gr1553b: improve init check

Check in init3 not needed since same data is already checked in init2
stage. Adds an extra check that the APB register space is available before
accessing it.

Closes #2331

File:

• c/src/lib/libbsp/sparc/shared/1553/gr1553b.c (modified) (3 diffs)

c/src/lib/libbsp/sparc/shared/1553/gr1553b.c

@@ -192 +192 @@
         }
         pnpinfo = &ambadev->info;
+        if ( pnpinfo->apb_slv == NULL )
+                return DRVMGR_EIO;
         regs = (struct gr1553b_regs *)pnpinfo->apb_slv->start;
 
@@ -228 +230 @@
         /* Get device information from AMBA PnP information */
         ambadev = (struct amba_dev_info *)dev->businfo;
-        if ( ambadev == NULL ) {
-                return DRVMGR_FAIL;
-        }
         pnpinfo = &ambadev->info;
         regs = (struct gr1553b_regs *)pnpinfo->apb_slv->start;
@@ -256 +255 @@
                 /* Init Minor and Next */
                 gr1553_list_add(&gr1553_rt_root, feat);
+        }
+
+        if ( priv->features == 0 ) {
+                /* no features in HW should never happen.. an I/O error? */
+                free(priv);
+                return DRVMGR_EIO;
         }