DRVMGR: KEY_TYPE now a enum drvmgr_kt

8 files changed, 15 insertions, 15 deletions

diff --git a/c/src/lib/libbsp/sparc/shared/pci/gr_leon4_n2x.c b/c/src/lib/libbsp/sparc/shared/pci/gr_leon4_n2x.c
index 43b725fe2d..9f19838370 100644
--- a/c/src/lib/libbsp/sparc/shared/pci/gr_leon4_n2x.c
+++ b/c/src/lib/libbsp/sparc/shared/pci/gr_leon4_n2x.c
@@ -516,7 +516,7 @@ int gr_cpci_leon4_n2x_init1(struct drvmgr_dev *dev)
 	 *
 	 * Only the 2 MSB bits have an effect.
 	 */
-	value = drvmgr_dev_key_get(priv->dev, "ahbmst2pci", KEY_TYPE_INT);
+	value = drvmgr_dev_key_get(priv->dev, "ahbmst2pci", DRVMGR_KT_INT);
 	if (value)
 		priv->ahbmst2pci_map = value->i;
 	else
@@ -525,7 +525,7 @@ int gr_cpci_leon4_n2x_init1(struct drvmgr_dev *dev)
 	/* Let user override the default AMBA system frequency of the 
 	 * CPU-bus of the remote GR-CPCI-LEON4-N2X. Default is 200MHz.
 	 */
-	value = drvmgr_dev_key_get(priv->dev, "ambaFreq", KEY_TYPE_INT);
+	value = drvmgr_dev_key_get(priv->dev, "ambaFreq", DRVMGR_KT_INT);
 	if (value)
 		priv->amba_freq_hz = value->i;
 	else
@@ -534,7 +534,7 @@ int gr_cpci_leon4_n2x_init1(struct drvmgr_dev *dev)
 	/* Let user determine clock-gating unit configuration. The default
 	 * is to turn all cores on (disable gating). PCI is always turned ON.
 	 */
-	value = drvmgr_dev_key_get(priv->dev, "cgEnMask", KEY_TYPE_INT);
+	value = drvmgr_dev_key_get(priv->dev, "cgEnMask", DRVMGR_KT_INT);
 	if (value)
 		priv->cg_en_mask = (value->i & CG_MASK) | 0x08;
 	else
diff --git a/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_adcdac.c b/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_adcdac.c
index 25b512aa07..32891313ff 100644
--- a/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_adcdac.c
+++ b/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_adcdac.c
@@ -418,7 +418,7 @@ int gr_rasta_adcdac_init1(struct drvmgr_dev *dev)
 	 * goes out on the PCI bus.
 	 * Only the 4 MSB bits have an effect;
 	 */
-	value = drvmgr_dev_key_get(priv->dev, "ahbmst2pci", KEY_TYPE_INT);
+	value = drvmgr_dev_key_get(priv->dev, "ahbmst2pci", DRVMGR_KT_INT);
 	if (value)
 		priv->ahbmst2pci_map = value->i;
 	else
diff --git a/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_io.c b/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_io.c
index dd8a7b1826..95bbee9902 100644
--- a/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_io.c
+++ b/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_io.c
@@ -597,7 +597,7 @@ int gr_rasta_io_init1(struct drvmgr_dev *dev)
 	 * goes out on the PCI bus.
 	 * Only the 4 MSB bits have an effect;
 	 */
-	value = drvmgr_dev_key_get(priv->dev, "ahbmst2pci", KEY_TYPE_INT);
+	value = drvmgr_dev_key_get(priv->dev, "ahbmst2pci", DRVMGR_KT_INT);
 	if (value)
 		priv->ahbmst2pci_map = value->i;
 	else
diff --git a/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_spw_router.c b/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_spw_router.c
index 6d53feabbd..8bce1186ff 100644
--- a/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_spw_router.c
+++ b/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_spw_router.c
@@ -430,7 +430,7 @@ int gr_rasta_spw_router_init1(struct drvmgr_dev *dev)
 	 * goes out on the PCI bus.
 	 * Only the 4 MSB bits have an effect;
 	 */
-	value = drvmgr_dev_key_get(priv->dev, "ahbmst2pci", KEY_TYPE_INT);
+	value = drvmgr_dev_key_get(priv->dev, "ahbmst2pci", DRVMGR_KT_INT);
 	if (value)
 		priv->ahbmst2pci_map = value->i;
 	else
diff --git a/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_tmtc.c b/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_tmtc.c
index c9cf8eac84..c8ba4c4962 100644
--- a/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_tmtc.c
+++ b/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_tmtc.c
@@ -609,7 +609,7 @@ int gr_rasta_tmtc_init1(struct drvmgr_dev *dev)
 	 * goes out on the PCI bus.
 	 * Only the 4 MSB bits have an effect;
 	 */
-	value = drvmgr_dev_key_get(priv->dev, "ahbmst2pci", KEY_TYPE_INT);
+	value = drvmgr_dev_key_get(priv->dev, "ahbmst2pci", DRVMGR_KT_INT);
 	if (value)
 		priv->ahbmst2pci_map = value->i;
 	else
diff --git a/c/src/lib/libbsp/sparc/shared/pci/grpci.c b/c/src/lib/libbsp/sparc/shared/pci/grpci.c
index d9559d1eb5..047f1c199d 100644
--- a/c/src/lib/libbsp/sparc/shared/pci/grpci.c
+++ b/c/src/lib/libbsp/sparc/shared/pci/grpci.c
@@ -545,21 +545,21 @@ static int grpci_init(struct grpci_priv *priv)
 
 			/* User may override Both hardcoded IRQ setup and Plug & Play IRQ */
 			keyname[3] = 'A' + (pin-1);
-			value = drvmgr_dev_key_get(priv->dev, keyname, KEY_TYPE_INT);
+			value = drvmgr_dev_key_get(priv->dev, keyname, DRVMGR_KT_INT);
 			if ( value )
 				grpci_pci_irq_table[pin-1] = value->i;
 		}
 	}
 
 	/* User may override DEFAULT_BT_ENABLED to enable/disable byte twisting */
-	value = drvmgr_dev_key_get(priv->dev, "byteTwisting", KEY_TYPE_INT);
+	value = drvmgr_dev_key_get(priv->dev, "byteTwisting", DRVMGR_KT_INT);
 	if ( value )
 		priv->bt_enabled = value->i;
 
 	/* Use GRPCI target BAR1 to map CPU RAM to PCI, this is to make it
 	 * possible for PCI peripherals to do DMA directly to CPU memory.
 	 */
-	value = drvmgr_dev_key_get(priv->dev, "tgtbar1", KEY_TYPE_INT);
+	value = drvmgr_dev_key_get(priv->dev, "tgtbar1", DRVMGR_KT_INT);
 	if (value)
 		priv->bar1_pci_adr = value->i;
 	else
diff --git a/c/src/lib/libbsp/sparc/shared/pci/grpci2.c b/c/src/lib/libbsp/sparc/shared/pci/grpci2.c
index 1b77921019..9d8dea6c9f 100644
--- a/c/src/lib/libbsp/sparc/shared/pci/grpci2.c
+++ b/c/src/lib/libbsp/sparc/shared/pci/grpci2.c
@@ -761,7 +761,7 @@ static int grpci2_init(struct grpci2_priv *priv)
 
 			/* User may override Both hardcoded IRQ setup and Plug & Play IRQ */
 			keyname[3] = 'A' + (pin-1);
-			value = drvmgr_dev_key_get(priv->dev, keyname, KEY_TYPE_INT);
+			value = drvmgr_dev_key_get(priv->dev, keyname, DRVMGR_KT_INT);
 			if (value)
 				grpci2_pci_irq_table[pin-1] = value->i;
 		}
@@ -772,12 +772,12 @@ static int grpci2_init(struct grpci2_priv *priv)
 	}
 
 	/* User may override DEFAULT_BT_ENABLED to enable/disable byte twisting */
-	value = drvmgr_dev_key_get(priv->dev, "byteTwisting", KEY_TYPE_INT);
+	value = drvmgr_dev_key_get(priv->dev, "byteTwisting", DRVMGR_KT_INT);
 	if (value)
 		priv->bt_enabled = value->i;
 
 	/* Let user Configure the 6 target BARs */
-	value = drvmgr_dev_key_get(priv->dev, "tgtBarCfg", KEY_TYPE_POINTER);
+	value = drvmgr_dev_key_get(priv->dev, "tgtBarCfg", DRVMGR_KT_POINTER);
 	if (value)
 		priv->barcfg = value->ptr;
 	else
diff --git a/c/src/lib/libbsp/sparc/shared/pci/pcif.c b/c/src/lib/libbsp/sparc/shared/pci/pcif.c
index 6d22fc361a..c0b8fc9629 100644
--- a/c/src/lib/libbsp/sparc/shared/pci/pcif.c
+++ b/c/src/lib/libbsp/sparc/shared/pci/pcif.c
@@ -457,14 +457,14 @@ static int pcif_init(struct pcif_priv *priv)
 
 			/* User may override Plug & Play IRQ */
 			keyname[3] = 'A' + (pin-1);
-			value = drvmgr_dev_key_get(priv->dev, keyname, KEY_TYPE_INT);
+			value = drvmgr_dev_key_get(priv->dev, keyname, DRVMGR_KT_INT);
 			if ( value )
 				pcif_pci_irq_table[pin-1] = value->i;
 		}
 	}
 
 	priv->irq_mask = 0xf;
-	value = drvmgr_dev_key_get(priv->dev, "", KEY_TYPE_INT);
+	value = drvmgr_dev_key_get(priv->dev, "", DRVMGR_KT_INT);
 	if ( value )
 		priv->irq_mask = value->i & 0xf;