Changeset 16572

Timestamp:

03/02/06 17:48:47 (3 years ago)

Author:

axeld

Message:

* Added a new list_insert_item_before() function that inserts a new item

before another one in the list.

* The video modes in the boot loader are now sorted (by resolution, larger

resolution comes first). Doubled entries are automatically removed; this
fixes bug #192.

Location:

haiku/trunk

Files:

• headers/private/kernel/util/list.h (modified) (2 diffs)
• src/system/boot/platform/bios_ia32/video.cpp (modified) (4 diffs)
• src/system/kernel/util/list.c (modified) (2 diffs)

haiku/trunk/headers/private/kernel/util/list.h

@@ -1 @@
-/* 
-** Copyright 2003-2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
-** Distributed under the terms of the OpenBeOS License.
-*/
+/*
+ * Copyright 2003-2006, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ */
 #ifndef KERNEL_LIST_H
 #define KERNEL_LIST_H
@@ -51 +51 @@
 extern void list_add_item(struct list *list, void *item);
 extern void list_remove_item(struct list *list, void *item);
+extern void list_insert_item_before(struct list *list, void *before, void *item);
 extern void *list_remove_head_item(struct list *list);
 extern void *list_remove_tail_item(struct list *list);

haiku/trunk/src/system/boot/platform/bios_ia32/video.cpp

@@ -1 +1 @@
 /*
- * Copyright 2004-2005, Axel Dörfler, axeld@pinc-software.de.
+ * Copyright 2004-2006, Axel Dörfler, axeld@pinc-software.de.
  * Distributed under the terms of the MIT License.
  */
@@ -45 +45 @@
 static bool sModeChosen;
 static bool sSettingsLoaded;
+
+
+static int
+compare_video_modes(video_mode *a, video_mode *b)
+{
+        int compare = a->width - b->width;
+        if (compare != 0)
+                return compare;
+
+        compare = a->height - b->height;
+        if (compare != 0)
+                return compare;
+
+        // TODO: compare video_mode::mode?
+        return a->bits_per_pixel - b->bits_per_pixel;
+}
+
+
+/**     Insert the video mode into the list, sorted by resolution and bit depth.
+ *      Higher resolutions/depths come first.
+ */
+
+static void
+add_video_mode(video_mode *videoMode)
+{
+        video_mode *mode = NULL;
+        while ((mode = (video_mode *)list_get_next_item(&sModeList, mode)) != NULL) {
+                int compare = compare_video_modes(videoMode, mode);
+                if (compare == 0) {
+                        // mode already exists
+                        return;
+                }
+
+                if (compare > 0)
+                        break;
+        }
+
+        list_insert_item_before(&sModeList, mode, videoMode);
+}
+
+
+static video_mode *
+find_video_mode(int32 width, int32 height, int32 depth)
+{
+        video_mode *mode = NULL;
+        while ((mode = (video_mode *)list_get_next_item(&sModeList, mode)) != NULL) {
+                if (mode->width == width
+                        && mode->height == height
+                        && mode->bits_per_pixel == depth) {
+                        return mode;
+                }
+        }
+
+        return NULL;
+}
+
+
+static void
+get_mode_from_settings(void)
+{
+        if (sSettingsLoaded)
+                return;
+
+        void *handle = load_driver_settings("vesa");
+        if (handle == NULL)
+                return;
+
+        const driver_settings *settings = get_driver_settings(handle);
+        if (settings == NULL)
+                goto out;
+
+        sSettingsLoaded = true;
+
+        for (int32 i = 0; i < settings->parameter_count; i++) {
+                driver_parameter &parameter = settings->parameters[i];
+
+                if (!strcmp(parameter.name, "mode") && parameter.value_count > 2) {
+                        // parameter found, now get its values
+                        int32 width = strtol(parameter.values[0], NULL, 0);
+                        int32 height = strtol(parameter.values[1], NULL, 0);
+                        int32 depth = strtol(parameter.values[2], NULL, 0);
+
+                        // search mode that fits
+
+                        video_mode *mode = find_video_mode(width, height, depth);
+                        if (mode != NULL)
+                                sMode = mode;
+                }
+        }
+
+out:
+        unload_driver_settings(handle);
+}
+
+
+//      #pragma mark - vga
 
 
@@ -190 +286 @@
                                 }
 
-                                list_add_item(&sModeList, videoMode);
+                                add_video_mode(videoMode);
                         }
                 } else
@@ -342 +438 @@
 
         return menu;
-}
-
-
-static video_mode *
-find_video_mode(int32 width, int32 height, int32 depth)
-{
-        video_mode *mode = NULL;
-        while ((mode = (video_mode *)list_get_next_item(&sModeList, mode)) != NULL) {
-                if (mode->width == width
-                        && mode->height == height
-                        && mode->bits_per_pixel == depth) {
-                        return mode;
-                }
-        }
-
-        return NULL;
-}
-
-
-static void
-get_mode_from_settings(void)
-{
-        if (sSettingsLoaded)
-                return;
-
-        void *handle = load_driver_settings("vesa");
-        if (handle == NULL)
-                return;
-
-        const driver_settings *settings = get_driver_settings(handle);
-        if (settings == NULL)
-                goto out;
-
-        sSettingsLoaded = true;
-
-        for (int32 i = 0; i < settings->parameter_count; i++) {
-                driver_parameter &parameter = settings->parameters[i];
-
-                if (!strcmp(parameter.name, "mode") && parameter.value_count > 2) {
-                        // parameter found, now get its values
-                        int32 width = strtol(parameter.values[0], NULL, 0);
-                        int32 height = strtol(parameter.values[1], NULL, 0);
-                        int32 depth = strtol(parameter.values[2], NULL, 0);
-
-                        // search mode that fits
-
-                        video_mode *mode = find_video_mode(width, height, depth);
-                        if (mode != NULL)
-                                sMode = mode;
-                }
-        }
-
-out:
-        unload_driver_settings(handle);
 }
 

haiku/trunk/src/system/kernel/util/list.c

@@ -1 @@
-/* 
-** Copyright 2003-2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
-** Distributed under the terms of the OpenBeOS License.
-*/
+/*
+ * Copyright 2003-2006, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ */
 
 
@@ -157 +157 @@
 
 
+/** Inserts an item before another item in the list.
+ *      If you pass NULL as \a before item, the item is added at the end of
+ *      the list.
+ */
+
+void
+list_insert_item_before(struct list *list, void *before, void *item)
+{
+        list_link *beforeLink;
+        list_link *link;
+
+        if (before == NULL) {
+                list_add_item(list, item);
+                return;
+        }
+
+        beforeLink = GET_LINK(list, before);
+        link = GET_LINK(list, item);
+
+        link->prev = beforeLink->prev;
+        link->next = beforeLink;
+
+        beforeLink->prev->next = link;
+        beforeLink->prev = link;
+}
+
+
 /** Removes the first item in the list and returns it.
  *      Returns NULL if the list is empty.