[haiku-commits] r36737 - in haiku/branches/releases/r1alpha2: . build/jam headers/os/interface src/add-ons/accelerants/common src/add-ons/kernel/bus_managers/acpi ...

  • From: ingo_weinhold@xxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sat, 8 May 2010 12:06:20 +0200 (CEST)

Author: bonefish
Date: 2010-05-08 12:06:20 +0200 (Sat, 08 May 2010)
New Revision: 36737
Changeset: http://dev.haiku-os.org/changeset/36737/haiku

Modified:
   haiku/branches/releases/r1alpha2/
   haiku/branches/releases/r1alpha2/build/jam/OptionalPackages
   haiku/branches/releases/r1alpha2/headers/os/interface/LayoutBuilder.h
   haiku/branches/releases/r1alpha2/src/add-ons/accelerants/common/decode_edid.c
   haiku/branches/releases/r1alpha2/src/add-ons/kernel/bus_managers/acpi/
   
haiku/branches/releases/r1alpha2/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/
   
haiku/branches/releases/r1alpha2/src/add-ons/kernel/drivers/power/enhanced_speedstep/enhanced_speedstep.cpp
   haiku/branches/releases/r1alpha2/src/apps/aboutsystem/AboutSystem.cpp
Log:
Merged r36716, r36722-r36724, r36726, r36734, r36736 from trunk into branch.



Property changes on: haiku/branches/releases/r1alpha2
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/haiku/trunk:36349-36353,36355-36358,36360-36375,36379,36381-36386,36388-36392,36394-36421,36424-36443,36451-36452,36455-36498,36500-36501,36503-36507,36509,36511,36513-36514,36516-36525,36527-36541,36543-36599,36601-36604,36607,36610-36634,36636-36639,36643-36644,36646-36649,36651-36657,36659,36670,36702-36707,36714
   + 
/haiku/trunk:36349-36353,36355-36358,36360-36375,36379,36381-36386,36388-36392,36394-36421,36424-36443,36451-36452,36455-36498,36500-36501,36503-36507,36509,36511,36513-36514,36516-36525,36527-36541,36543-36599,36601-36604,36607,36610-36634,36636-36639,36643-36644,36646-36649,36651-36657,36659,36670,36702-36707,36714,36716,36722-36724,36726,36734,36736

Modified: haiku/branches/releases/r1alpha2/build/jam/OptionalPackages
===================================================================
--- haiku/branches/releases/r1alpha2/build/jam/OptionalPackages 2010-05-08 
09:41:36 UTC (rev 36736)
+++ haiku/branches/releases/r1alpha2/build/jam/OptionalPackages 2010-05-08 
10:06:20 UTC (rev 36737)
@@ -1361,15 +1361,15 @@
        if $(TARGET_ARCH) != x86 {
                Echo "No optional package Vision available for $(TARGET_ARCH)" ;
        } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
-               InstallOptionalHaikuImagePackage Vision-0.9.7-H-090423-1.zip
-                       : $(baseURL)/Vision-0.9.7-H-x86-gcc4-2009-04-23.zip
+               InstallOptionalHaikuImagePackage 
Vision-0.9.7-H-x86-gcc4-r1a2-2010-05-07.zip
+                       : $(baseURL)/Vision-0.9.7-H-x86-gcc4-r1a2-2010-05-07.zip
                        : apps
                ;
                AddSymlinkToHaikuImage home config be Applications
                        : /boot/apps/Vision-0.9.7-H-090423/Vision ;
        } else {
-               InstallOptionalHaikuImagePackage Vision-0.9.7-H-090423.zip
-                       : $(baseURL)/Vision-0.9.7-H-x86-gcc2-2009-04-23.zip
+               InstallOptionalHaikuImagePackage 
Vision-0.9.7-H-x86-gcc2-r1a2-2010-05-07.zip
+                       : $(baseURL)/Vision-0.9.7-H-x86-gcc2-r1a2-2010-05-07.zip
                        : apps
                ;
                AddSymlinkToHaikuImage home config be Applications

Modified: haiku/branches/releases/r1alpha2/headers/os/interface/LayoutBuilder.h
===================================================================
--- haiku/branches/releases/r1alpha2/headers/os/interface/LayoutBuilder.h       
2010-05-08 09:41:36 UTC (rev 36736)
+++ haiku/branches/releases/r1alpha2/headers/os/interface/LayoutBuilder.h       
2010-05-08 10:06:20 UTC (rev 36737)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009, Haiku, Inc. All rights reserved.
+ * Copyright 2009-2010, Haiku, Inc. All rights reserved.
  * Distributed under the terms of the MIT License.
  */
 #ifndef        _LAYOUT_BUILDER_H
@@ -240,9 +240,12 @@
 Group<ParentBuilder>::Group(BWindow* window, enum orientation orientation,
        float spacing)
        :
-       fLayout((new BGroupView(orientation, spacing))->GroupLayout())
+       fLayout(new BGroupLayout(orientation, spacing))
 {
        window->SetLayout(fLayout);
+
+       fLayout->View()->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
+               // TODO: we get a white background if we don't do this
 }
 
 
@@ -429,9 +432,12 @@
 Grid<ParentBuilder>::Grid(BWindow* window, float horizontalSpacing,
        float verticalSpacing)
        :
-       fLayout((new BGridView(horizontalSpacing, 
verticalSpacing))->GridLayout())
+       fLayout(new BGridLayout(horizontalSpacing, verticalSpacing))
 {
        window->SetLayout(fLayout);
+
+       fLayout->View()->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
+               // TODO: we get a white background if we don't do this
 }
 
 

Modified: 
haiku/branches/releases/r1alpha2/src/add-ons/accelerants/common/decode_edid.c
===================================================================
--- 
haiku/branches/releases/r1alpha2/src/add-ons/accelerants/common/decode_edid.c   
    2010-05-08 09:41:36 UTC (rev 36736)
+++ 
haiku/branches/releases/r1alpha2/src/add-ons/accelerants/common/decode_edid.c   
    2010-05-08 10:06:20 UTC (rev 36737)
@@ -181,7 +181,6 @@
        int i, j;
 
        for (i = 0; i < EDID1_NUM_DETAILED_MONITOR_DESC; ++i, ++monitor, ++raw) 
{
-               monitor->monitor_desc_type = EDID1_IS_DETAILED_TIMING;
 
                // workaround: normally, all four bytes must be zero for 
detailed
                // description, but at least some Formac monitors violate that:
@@ -225,7 +224,8 @@
                                        }
                                        break;
                        }
-               } else {
+               } else if (raw->detailed_timing.pixel_clock > 0) {
+                       monitor->monitor_desc_type = EDID1_IS_DETAILED_TIMING;
                        decode_detailed_timing(&monitor->data.detailed_timing,
                                &raw->detailed_timing);
                }


Property changes on: 
haiku/branches/releases/r1alpha2/src/add-ons/kernel/bus_managers/acpi
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/haiku/trunk/src/add-ons/kernel/bus_managers/acpi:36349-36353,36355-36358,36360-36375,36379,36381-36386,36388-36392,36394-36421,36424-36443,36451-36452,36455-36498,36500-36501,36503-36507,36509,36511,36513-36514,36516-36525,36527-36541,36543-36599,36601-36604,36607,36610-36634,36636-36639,36643-36644,36646-36649,36651-36657,36659,36670,36702-36707,36714
/haiku/vendor/acpica/20100121:35554-35558
/haiku/vendor/acpica/current:33139-35553
   + 
/haiku/trunk/src/add-ons/kernel/bus_managers/acpi:36349-36353,36355-36358,36360-36375,36379,36381-36386,36388-36392,36394-36421,36424-36443,36451-36452,36455-36498,36500-36501,36503-36507,36509,36511,36513-36514,36516-36525,36527-36541,36543-36599,36601-36604,36607,36610-36634,36636-36639,36643-36644,36646-36649,36651-36657,36659,36670,36702-36707,36714,36716,36722-36724,36726,36734,36736
/haiku/vendor/acpica/20100121:35554-35558
/haiku/vendor/acpica/current:33139-35553


Property changes on: 
haiku/branches/releases/r1alpha2/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/haiku/trunk/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath:36349-36353,36355-36358,36360-36375,36379,36381-36386,36388-36392,36394-36421,36424-36443,36451-36452,36455-36498,36500-36501,36503-36507,36509,36511,36513-36514,36516-36525,36527-36541,36543-36599,36601-36604,36607,36610-36634,36636-36639,36643-36644,36646-36649,36651-36657,36659,36670,36702-36707,36714
/haiku/vendor/freebsd/HEAD/dev/ath/r204100:35677-35713
/haiku/vendor/freebsd/current/dev/ath:34314-35676
   + 
/haiku/trunk/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath:36349-36353,36355-36358,36360-36375,36379,36381-36386,36388-36392,36394-36421,36424-36443,36451-36452,36455-36498,36500-36501,36503-36507,36509,36511,36513-36514,36516-36525,36527-36541,36543-36599,36601-36604,36607,36610-36634,36636-36639,36643-36644,36646-36649,36651-36657,36659,36670,36702-36707,36714,36716,36722-36724,36726,36734,36736
/haiku/vendor/freebsd/HEAD/dev/ath/r204100:35677-35713
/haiku/vendor/freebsd/current/dev/ath:34314-35676

Modified: 
haiku/branches/releases/r1alpha2/src/add-ons/kernel/drivers/power/enhanced_speedstep/enhanced_speedstep.cpp
===================================================================
--- 
haiku/branches/releases/r1alpha2/src/add-ons/kernel/drivers/power/enhanced_speedstep/enhanced_speedstep.cpp
 2010-05-08 09:41:36 UTC (rev 36736)
+++ 
haiku/branches/releases/r1alpha2/src/add-ons/kernel/drivers/power/enhanced_speedstep/enhanced_speedstep.cpp
 2010-05-08 10:06:20 UTC (rev 36737)
@@ -268,6 +268,10 @@
        if ((sysInfo.cpu_type & B_CPU_x86_VENDOR_MASK) != B_CPU_INTEL_x86)
                return 0.0;
 
+       // TODO: Make the code SMP safe!
+       if (sysInfo.cpu_count > 1)
+               return 0.0;
+
        cpuid_info info;
        if (get_cpuid(&info, 1, cpuNum) != B_OK)
                return 0.0;

Modified: haiku/branches/releases/r1alpha2/src/apps/aboutsystem/AboutSystem.cpp
===================================================================
--- haiku/branches/releases/r1alpha2/src/apps/aboutsystem/AboutSystem.cpp       
2010-05-08 09:41:36 UTC (rev 36736)
+++ haiku/branches/releases/r1alpha2/src/apps/aboutsystem/AboutSystem.cpp       
2010-05-08 10:06:20 UTC (rev 36737)
@@ -99,6 +99,9 @@
                "Jean-Loïc Charroud\n"
                "Adrien Destugues (PulkoMandy)\n"
        },
+       { "da",
+               "Brian Matzon\n"
+       },
        { "de",
                "Colin Günther\n"
                "leszek\n"
@@ -118,6 +121,7 @@
                "Hironoru Ichimiya\n"
                "Jorge G. Mare (Koki)\n"
                "Takashi Murai\n"
+               "Satoshi Eguchi\n"
                "SHINTA\n"
                "Hiroyuki Tsutsumi\n"
                "The JPBE.net user group\n"


Other related posts:

  • » [haiku-commits] r36737 - in haiku/branches/releases/r1alpha2: . build/jam headers/os/interface src/add-ons/accelerants/common src/add-ons/kernel/bus_managers/acpi ... - ingo_weinhold