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

Card Resource Register was a 16-bit register not a 32-bit one.

Browse Source 
Used existing constants for bits on the register.
This commit is contained in:
Joel Sherrill
1998-08-06 15:05:59 +00:00
parent 308e18c397
commit c23118b036
5 changed files with 36 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
c/src/lib/libbsp/powerpc/dmv177/console/config.c
View File

@@ -243,11 +243,14 @@ rtems_device_minor_number Console_Port_Minor;
boolean dmv177_z85c30_probe(int minor) boolean dmv177_z85c30_probe(int minor)
{ {
volatile unsigned32 *dma_control_status_reg; 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; return FALSE;
/* /*
@@ -266,11 +269,14 @@ boolean dmv177_z85c30_probe(int minor)
boolean dmv177_mc68681_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 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_DUART_INST_MASK;
if ( v == DMV170_DUART_INSTALLED )
return TRUE; return TRUE;
return FALSE; return FALSE;

18
c/src/lib/libbsp/powerpc/dmv177/console/conscfg.c
View File

@@ -243,11 +243,14 @@ rtems_device_minor_number Console_Port_Minor;
boolean dmv177_z85c30_probe(int minor) boolean dmv177_z85c30_probe(int minor)
{ {
volatile unsigned32 *dma_control_status_reg; 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; return FALSE;
/* /*
@@ -266,11 +269,14 @@ boolean dmv177_z85c30_probe(int minor)
boolean dmv177_mc68681_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 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_DUART_INST_MASK;
if ( v == DMV170_DUART_INSTALLED )
return TRUE; return TRUE;
return FALSE; return FALSE;

10
c/src/lib/libbsp/powerpc/dmv177/include/dmv170.h
View File

@@ -273,16 +273,6 @@ extern "C" {
#define SCV64_Is_IRQ5( _status ) (_status&0x20) #define SCV64_Is_IRQ5( _status ) (_status&0x20)
/*
* 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 * scv64.c
*/ */

9
c/src/lib/libbsp/powerpc/dmv177/tod/config.c
View File

@@ -64,11 +64,14 @@ rtems_device_minor_number RTC_Minor;
boolean dmv177_icm7170_probe(int 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 TRUE;
return FALSE; return FALSE;

9
c/src/lib/libbsp/powerpc/dmv177/tod/todcfg.c
View File

@@ -64,11 +64,14 @@ rtems_device_minor_number RTC_Minor;
boolean dmv177_icm7170_probe(int 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 TRUE;
return FALSE; return FALSE;