diff options
| author | Jesse Barnes <jbarnes@hobbes.virtuousgeek.org> | 2007-12-04 18:27:24 -0800 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@hobbes.virtuousgeek.org> | 2007-12-04 18:27:24 -0800 |
| commit | 4c1fa5235555c9ef3de1eebd006c4e91283362bf (patch) | |
| tree | 64c5a51df9204724a64dce7281b4f5a4bb8322af /src/i830_lvds.c | |
| parent | 30d74f1b1f30e751d2c47aa63a4a2043e71467dc (diff) | |
Add BCM_ to backlight control method enums
Avoids polluting the global namespace with such generic terms.
Diffstat (limited to 'src/i830_lvds.c')
| -rw-r--r-- | src/i830_lvds.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/i830_lvds.c b/src/i830_lvds.c index da1fc462..602a55da 100644 --- a/src/i830_lvds.c +++ b/src/i830_lvds.c @@ -109,18 +109,18 @@ i830_set_lvds_backlight_method(xf86OutputPtr output) ScrnInfoPtr pScrn = output->scrn; I830Ptr pI830 = I830PTR(pScrn); CARD32 blc_pwm_ctl, blc_pwm_ctl2; - enum backlight_control method = NATIVE; /* Default to native */ + enum backlight_control method = BCM_NATIVE; /* Default to native */ if (i830_kernel_backlight_available(output)) { - method = KERNEL; + method = BCM_KERNEL; } else if (IS_I965GM(pI830)) { blc_pwm_ctl2 = INREG(BLC_PWM_CTL2); if (blc_pwm_ctl2 & BLM_LEGACY_MODE2) - method = LEGACY; + method = BCM_LEGACY; } else { blc_pwm_ctl = INREG(BLC_PWM_CTL); if (blc_pwm_ctl & BLM_LEGACY_MODE) - method = LEGACY; + method = BCM_LEGACY; } pI830->backlight_control_method = method; @@ -646,24 +646,24 @@ i830_lvds_set_backlight_control(xf86OutputPtr output) struct i830_lvds_priv *dev_priv = intel_output->dev_priv; switch (pI830->backlight_control_method) { - case NATIVE: + case BCM_NATIVE: dev_priv->set_backlight = i830_lvds_set_backlight_native; dev_priv->get_backlight = i830_lvds_get_backlight_native; dev_priv->backlight_max = i830_lvds_get_backlight_max_native(output); break; - case LEGACY: + case BCM_LEGACY: dev_priv->set_backlight = i830_lvds_set_backlight_legacy; dev_priv->get_backlight = i830_lvds_get_backlight_legacy; dev_priv->backlight_max = 0xff; break; - case COMBO: + case BCM_COMBO: dev_priv->set_backlight = i830_lvds_set_backlight_combo; dev_priv->get_backlight = i830_lvds_get_backlight_combo; dev_priv->backlight_max = i830_lvds_get_backlight_max_native(output); break; - case KERNEL: + case BCM_KERNEL: dev_priv->set_backlight = i830_lvds_set_backlight_kernel; dev_priv->get_backlight = i830_lvds_get_backlight_kernel; dev_priv->backlight_max = @@ -990,22 +990,22 @@ i830_lvds_init(ScrnInfoPtr pScrn) i830_set_lvds_backlight_method(output); switch (pI830->backlight_control_method) { - case NATIVE: + case BCM_NATIVE: dev_priv->set_backlight = i830_lvds_set_backlight_native; dev_priv->get_backlight = i830_lvds_get_backlight_native; dev_priv->backlight_max = i830_lvds_get_backlight_max_native(output); break; - case LEGACY: + case BCM_LEGACY: dev_priv->set_backlight = i830_lvds_set_backlight_legacy; dev_priv->get_backlight = i830_lvds_get_backlight_legacy; dev_priv->backlight_max = 0xff; break; - case COMBO: + case BCM_COMBO: dev_priv->set_backlight = i830_lvds_set_backlight_combo; dev_priv->get_backlight = i830_lvds_get_backlight_combo; dev_priv->backlight_max = i830_lvds_get_backlight_max_native(output); break; - case KERNEL: + case BCM_KERNEL: dev_priv->set_backlight = i830_lvds_set_backlight_kernel; dev_priv->get_backlight = i830_lvds_get_backlight_kernel; dev_priv->backlight_max = i830_lvds_get_backlight_max_kernel(output); |