Changeset bd08239 in mainline for kernel/generic/src/console

Timestamp:

2011-06-18T15:35:25Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

44e2c1a

Parents:

313775b (diff), adfdbd5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

Location:

kernel/generic/src/console

Files:

• cmd.c (modified) (3 diffs)
• console.c (modified) (2 diffs)
• kconsole.c (modified) (6 diffs)

kernel/generic/src/console/cmd.c

@@ -573 +573 @@
         spinlock_lock(&cmd_lock);
         
-        link_t *cur;
         size_t len = 0;
-        for (cur = cmd_head.next; cur != &cmd_head; cur = cur->next) {
+        list_foreach(cmd_list, cur) {
                 cmd_info_t *hlp;
                 hlp = list_get_instance(cur, cmd_info_t, link);
@@ -591 +590 @@
         }
         
-        for (cur = cmd_head.next; cur != &cmd_head; cur = cur->next) {
+        list_foreach(cmd_list, cur) {
                 cmd_info_t *hlp;
                 hlp = list_get_instance(cur, cmd_info_t, link);
@@ -646 +645 @@
 int cmd_desc(cmd_arg_t *argv)
 {
-        link_t *cur;
-        
         spinlock_lock(&cmd_lock);
         
-        for (cur = cmd_head.next; cur != &cmd_head; cur = cur->next) {
+        list_foreach(cmd_list, cur) {
                 cmd_info_t *hlp;
                 

kernel/generic/src/console/console.c

@@ -124 +124 @@
 static void stdout_write(outdev_t *dev, wchar_t ch, bool silent)
 {
-        link_t *cur;
-        
-        for (cur = dev->list.next; cur != &dev->list; cur = cur->next) {
+        list_foreach(dev->list, cur) {
                 outdev_t *sink = list_get_instance(cur, outdev_t, link);
                 if ((sink) && (sink->op->write))
@@ -135 +133 @@
 static void stdout_redraw(outdev_t *dev)
 {
-        link_t *cur;
-        
-        for (cur = dev->list.next; cur != &dev->list; cur = cur->next) {
+        list_foreach(dev->list, cur) {
                 outdev_t *sink = list_get_instance(cur, outdev_t, link);
                 if ((sink) && (sink->op->redraw))

kernel/generic/src/console/kconsole.c

@@ -84 +84 @@
 
 SPINLOCK_INITIALIZE(cmd_lock);  /**< Lock protecting command list. */
-LIST_INITIALIZE(cmd_head);      /**< Command list. */
+LIST_INITIALIZE(cmd_list);      /**< Command list. */
 
 static wchar_t history[KCONSOLE_HISTORY][MAX_CMDLINE] = {};
@@ -113 +113 @@
 bool cmd_register(cmd_info_t *cmd)
 {
-        link_t *cur;
-        
         spinlock_lock(&cmd_lock);
         
@@ -120 +118 @@
          * Make sure the command is not already listed.
          */
-        for (cur = cmd_head.next; cur != &cmd_head; cur = cur->next) {
+        list_foreach(cmd_list, cur) {
                 cmd_info_t *hlp = list_get_instance(cur, cmd_info_t, link);
                 
@@ -153 +151 @@
          * Now the command can be added.
          */
-        list_append(&cmd->link, &cmd_head);
+        list_append(&cmd->link, &cmd_list);
         
         spinlock_unlock(&cmd_lock);
@@ -176 +174 @@
         
         if (*startpos == NULL)
-                *startpos = cmd_head.next;
-        
-        for (; *startpos != &cmd_head; *startpos = (*startpos)->next) {
+                *startpos = cmd_list.head.next;
+        
+        for (; *startpos != &cmd_list.head; *startpos = (*startpos)->next) {
                 cmd_info_t *hlp = list_get_instance(*startpos, cmd_info_t, link);
                 
@@ -559 +557 @@
         
         cmd_info_t *cmd = NULL;
-        link_t *cur;
-        
-        for (cur = cmd_head.next; cur != &cmd_head; cur = cur->next) {
+        
+        list_foreach(cmd_list, cur) {
                 cmd_info_t *hlp = list_get_instance(cur, cmd_info_t, link);
                 spinlock_lock(&hlp->lock);