From aa3468008cfb0adad5c8ee20b5cb7f32045c4496 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Wed, 4 Jan 2012 18:31:50 +0000
Subject: (readCardsDB,install_server,handle_FIRMWARE) handle new
 DRIVER2_NO_FIRMWARE and FIRMWARE keywords

thus enabling to handle drivers needing firmware
(fixes mga#1471, mga#3421)
---
 lib/Xconfig/proprietary.pm | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'lib/Xconfig/proprietary.pm')

diff --git a/lib/Xconfig/proprietary.pm b/lib/Xconfig/proprietary.pm
index 8fd701f..f4fb0c4 100644
--- a/lib/Xconfig/proprietary.pm
+++ b/lib/Xconfig/proprietary.pm
@@ -47,6 +47,21 @@ sub handle_DRIVER2_NO_SSE {
     }
 }
 
+sub handle_FIRMWARE {
+    my ($do_pkgs, $card) = @_;
+
+    my $pkg = $card->{FIRMWARE} or return;
+
+    $do_pkgs->is_installed($pkg) || $do_pkgs->install($pkg) and return;
+
+    if ($card->{DRIVER2_NO_FIRMWARE}) {
+	log::l("$card->{Driver2} need a firmware to work, switching back to $card->{DRIVER2_NO_FIRMWARE}");
+	$card->{Driver2} = $card->{DRIVER2_NO_FIRMWARE};
+    } else {
+	log::l("$card->{Driver2} needs a firmware to work smoothly/better (eg: 3D, KMS) but will still work");
+    }
+}
+
 
 sub pkgs_for_Driver2 {
     my ($Driver2, $do_pkgs) = @_;
-- 
cgit v1.2.1