Changeset ff381a7 in mainline for kernel/generic

Timestamp:

2015-11-02T20:54:19Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d8513177

Parents:

3feeab2 (diff), 5265eea4 (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

Files:

• include/adt/list.h (modified) (3 diffs)
• src/adt/list.c (modified) (2 diffs)
• src/console/console.c (modified) (1 diff)
• src/ipc/event.c (modified) (4 diffs)
• src/ipc/irq.c (modified) (1 diff)

kernel/generic/include/adt/list.h

@@ -53 +53 @@
 
 
-extern int list_member(const link_t *, const list_t *);
+extern bool list_member(const link_t *, const list_t *);
 extern void list_splice(list_t *, link_t *);
-extern unsigned int list_count(const list_t *);
+extern unsigned long list_count(const list_t *);
 
 
@@ -220 +220 @@
  *
  */
-NO_TRACE static inline int list_empty(const list_t *list)
+NO_TRACE static inline bool list_empty(const list_t *list)
 {
         return (list->head.next == &list->head);
@@ -353 +353 @@
  *
  */
-static inline link_t *list_nth(list_t *list, unsigned int n)
-{
-        unsigned int cnt = 0;
+static inline link_t *list_nth(list_t *list, unsigned long n)
+{
+        unsigned long cnt = 0;
         link_t *link;
         

kernel/generic/src/adt/list.c

@@ -52 +52 @@
  *
  */
-int list_member(const link_t *link, const list_t *list)
+bool list_member(const link_t *link, const list_t *list)
 {
         bool found = false;
@@ -99 +99 @@
  * @return              Number of items in the list.
  */
-unsigned int list_count(const list_t *list)
+unsigned long list_count(const list_t *list)
 {
-        unsigned int count = 0;
+        unsigned long count = 0;
         
         link_t *link = list_first(list);

kernel/generic/src/console/console.c

@@ -437 +437 @@
         }
 
-        return size;
+        return EOK;
 }
 

kernel/generic/src/ipc/event.c

@@ -251 +251 @@
  *
  * @return EOK if the subscription was successful.
- * @return EEXISTS if the notifications of the given type are
+ * @return EEXIST if the notifications of the given type are
  *         already subscribed.
  *
@@ -269 +269 @@
                 res = EOK;
         } else
-                res = EEXISTS;
+                res = EEXIST;
         
         spinlock_unlock(&event->lock);
@@ -282 +282 @@
  *
  * @return EOK if the subscription was successful.
- * @return EEXISTS if the notifications of the given type are
+ * @return EEXIST if the notifications of the given type are
  *         already subscribed.
  *
@@ -334 +334 @@
  * @return EOK on success.
  * @return ELIMIT on unknown event type.
- * @return EEXISTS if the notifications of the given type are
+ * @return EEXIST if the notifications of the given type are
  *         already subscribed.
  *

kernel/generic/src/ipc/irq.c

@@ -351 +351 @@
                 
                 free(irq);
-                return EEXISTS;
+                return EEXIST;
         }