diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 1998-08-06 15:05:59 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 1998-08-06 15:05:59 +0000 |
| commit | c23118b036a0d82bac148f763332f71670601f83 (patch) | |
| tree | d35b7a56413c6d48d18c4153e2a48cb03e1ea045 /c/src/lib/libbsp/powerpc/dmv177 | |
| parent | Added support for the Card Resource Register. The new probe routines (diff) | |
| download | rtems-c23118b036a0d82bac148f763332f71670601f83.tar.bz2 | |
Card Resource Register was a 16-bit register not a 32-bit one.
Used existing constants for bits on the register.
Diffstat (limited to 'c/src/lib/libbsp/powerpc/dmv177')
| -rw-r--r-- | c/src/lib/libbsp/powerpc/dmv177/console/config.c | 18 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/dmv177/console/conscfg.c | 18 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/dmv177/include/dmv170.h | 10 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/dmv177/tod/config.c | 9 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/dmv177/tod/todcfg.c | 9 |
5 files changed, 36 insertions, 28 deletions
diff --git a/c/src/lib/libbsp/powerpc/dmv177/console/config.c b/c/src/lib/libbsp/powerpc/dmv177/console/config.c index b092e14c37..e3a0eb073f 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/console/config.c +++ b/c/src/lib/libbsp/powerpc/dmv177/console/config.c @@ -243,11 +243,14 @@ rtems_device_minor_number Console_Port_Minor; boolean dmv177_z85c30_probe(int minor) { volatile unsigned32 *dma_control_status_reg; - volatile unsigned32 *card_resource_reg; + volatile unsigned16 *card_resource_reg; + unsigned16 v; - card_resource_reg = (volatile unsigned32 *) DMV170_CARD_RESORCE_REG; + card_resource_reg = (volatile unsigned16 *) DMV170_CARD_RESORCE_REG; - if ( !(*card_resource_reg & DMV170_DUART_PRESENT_BIT) ) + v = *card_resource_reg & DMV170_SCC_INST_MASK; + + if ( v != DMV170_SCC_INSTALLED ) return FALSE; /* @@ -266,11 +269,14 @@ boolean dmv177_z85c30_probe(int minor) boolean dmv177_mc68681_probe(int minor) { - volatile unsigned32 *card_resource_reg; + volatile unsigned16 *card_resource_reg; + unsigned16 v; + + card_resource_reg = (volatile unsigned16 *) DMV170_CARD_RESORCE_REG; - card_resource_reg = (volatile unsigned32 *) DMV170_CARD_RESORCE_REG; + v = *card_resource_reg & DMV170_DUART_INST_MASK; - if ( *card_resource_reg & DMV170_DUART_PRESENT_BIT ) + if ( v == DMV170_DUART_INSTALLED ) return TRUE; return FALSE; diff --git a/c/src/lib/libbsp/powerpc/dmv177/console/conscfg.c b/c/src/lib/libbsp/powerpc/dmv177/console/conscfg.c index b092e14c37..e3a0eb073f 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/console/conscfg.c +++ b/c/src/lib/libbsp/powerpc/dmv177/console/conscfg.c @@ -243,11 +243,14 @@ rtems_device_minor_number Console_Port_Minor; boolean dmv177_z85c30_probe(int minor) { volatile unsigned32 *dma_control_status_reg; - volatile unsigned32 *card_resource_reg; + volatile unsigned16 *card_resource_reg; + unsigned16 v; - card_resource_reg = (volatile unsigned32 *) DMV170_CARD_RESORCE_REG; + card_resource_reg = (volatile unsigned16 *) DMV170_CARD_RESORCE_REG; - if ( !(*card_resource_reg & DMV170_DUART_PRESENT_BIT) ) + v = *card_resource_reg & DMV170_SCC_INST_MASK; + + if ( v != DMV170_SCC_INSTALLED ) return FALSE; /* @@ -266,11 +269,14 @@ boolean dmv177_z85c30_probe(int minor) boolean dmv177_mc68681_probe(int minor) { - volatile unsigned32 *card_resource_reg; + volatile unsigned16 *card_resource_reg; + unsigned16 v; + + card_resource_reg = (volatile unsigned16 *) DMV170_CARD_RESORCE_REG; - card_resource_reg = (volatile unsigned32 *) DMV170_CARD_RESORCE_REG; + v = *card_resource_reg & DMV170_DUART_INST_MASK; - if ( *card_resource_reg & DMV170_DUART_PRESENT_BIT ) + if ( v == DMV170_DUART_INSTALLED ) return TRUE; return FALSE; diff --git a/c/src/lib/libbsp/powerpc/dmv177/include/dmv170.h b/c/src/lib/libbsp/powerpc/dmv177/include/dmv170.h index e5019b4392..b676dafe0c 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/include/dmv170.h +++ b/c/src/lib/libbsp/powerpc/dmv177/include/dmv170.h @@ -274,16 +274,6 @@ extern "C" { /* - * Card Resource Register Constants - */ - -#define DMV170_DUART_PRESENT_BIT 0x0100 -#define DMV170_SONIC_PRESENT_BIT 0x0200 -#define DMV170_16MBYTES_FLASH_BIT 0x0400 -#define DMV170_SCC_PRESENT_BIT 0x0800 -#define DMV170_RTC_PRESENT_BIT 0x1000 - -/* * scv64.c */ diff --git a/c/src/lib/libbsp/powerpc/dmv177/tod/config.c b/c/src/lib/libbsp/powerpc/dmv177/tod/config.c index 1a94bc3da5..aa44aa66bf 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/tod/config.c +++ b/c/src/lib/libbsp/powerpc/dmv177/tod/config.c @@ -64,11 +64,14 @@ rtems_device_minor_number RTC_Minor; boolean dmv177_icm7170_probe(int minor) { - volatile unsigned32 *card_resource_reg; + volatile unsigned16 *card_resource_reg; + unsigned16 v; - card_resource_reg = (volatile unsigned32 *) DMV170_CARD_RESORCE_REG; + card_resource_reg = (volatile unsigned16 *) DMV170_CARD_RESORCE_REG; - if ( *card_resource_reg & DMV170_RTC_PRESENT_BIT ) + v = *card_resource_reg & DMV170_RTC_INST_MASK; + + if ( v == DMV170_RTC_INSTALLED ) return TRUE; return FALSE; diff --git a/c/src/lib/libbsp/powerpc/dmv177/tod/todcfg.c b/c/src/lib/libbsp/powerpc/dmv177/tod/todcfg.c index 1a94bc3da5..aa44aa66bf 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/tod/todcfg.c +++ b/c/src/lib/libbsp/powerpc/dmv177/tod/todcfg.c @@ -64,11 +64,14 @@ rtems_device_minor_number RTC_Minor; boolean dmv177_icm7170_probe(int minor) { - volatile unsigned32 *card_resource_reg; + volatile unsigned16 *card_resource_reg; + unsigned16 v; - card_resource_reg = (volatile unsigned32 *) DMV170_CARD_RESORCE_REG; + card_resource_reg = (volatile unsigned16 *) DMV170_CARD_RESORCE_REG; - if ( *card_resource_reg & DMV170_RTC_PRESENT_BIT ) + v = *card_resource_reg & DMV170_RTC_INST_MASK; + + if ( v == DMV170_RTC_INSTALLED ) return TRUE; return FALSE; |