diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2020-09-18 10:00:46 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2020-10-16 07:07:19 +0200 |
| commit | f9c8e14dcb578c503c666ffdabe06d28b383700d (patch) | |
| tree | 77aa2db2612a3ae85b09218a561f23db3e1d6a7f /bsps/shared/grlib/amba/ambapp.c | |
| parent | c15c520b96363966c0087a997ea6db10f52451f4 (diff) | |
grlib: Add ambapp_common_info to derived types
This avoids a cast in DEV_TO_COMMON().
Diffstat (limited to 'bsps/shared/grlib/amba/ambapp.c')
| -rw-r--r-- | bsps/shared/grlib/amba/ambapp.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/bsps/shared/grlib/amba/ambapp.c b/bsps/shared/grlib/amba/ambapp.c index 69018f47e7..e87c86a586 100644 --- a/bsps/shared/grlib/amba/ambapp.c +++ b/bsps/shared/grlib/amba/ambapp.c @@ -71,9 +71,9 @@ static void ambapp_ahb_dev_init( dev->vendor = ambapp_pnp_vendor(ahb->id); dev->device = ambapp_pnp_device(ahb->id); ahb_info = DEV_TO_AHB(dev); - ahb_info->ver = ambapp_pnp_ver(ahb->id); - ahb_info->irq = ambapp_pnp_irq(ahb->id); - ahb_info->ahbidx = ahbidx; + ahb_info->common.ver = ambapp_pnp_ver(ahb->id); + ahb_info->common.irq = ambapp_pnp_irq(ahb->id); + ahb_info->common.ahbidx = ahbidx; ahb_info->custom[0] = (unsigned int)ahb->custom[0]; ahb_info->custom[1] = (unsigned int)ahb->custom[1]; ahb_info->custom[2] = (unsigned int)ahb->custom[2]; @@ -116,9 +116,9 @@ static void ambapp_apb_dev_init( dev->vendor = ambapp_pnp_vendor(apb->id); dev->device = ambapp_pnp_device(apb->id); apb_info = DEV_TO_APB(dev); - apb_info->ver = ambapp_pnp_ver(apb->id); - apb_info->irq = ambapp_pnp_irq(apb->id); - apb_info->ahbidx = ahbidx; + apb_info->common.ver = ambapp_pnp_ver(apb->id); + apb_info->common.irq = ambapp_pnp_irq(apb->id); + apb_info->common.ahbidx = ahbidx; apb_info->start = ambapp_pnp_apb_start(apb->iobar, base); apb_info->mask = ambapp_pnp_apb_mask(apb->iobar); } @@ -223,7 +223,7 @@ static int ambapp_scan2( /* Is it a AHB/AHB Bridge ? */ if (((dev->device == GAISLER_AHB2AHB) && - (dev->vendor == VENDOR_GAISLER) && (ahb_info->ver > 0)) || + (dev->vendor == VENDOR_GAISLER) && (ahb_info->common.ver > 0)) || ((dev->device == GAISLER_L2CACHE) && (dev->vendor == VENDOR_GAISLER)) || ((dev->device == GAISLER_GRIOMMU) && |