Changeset 3f03199 in mainline for uspace/srv/hid/output/output.c

Timestamp:

2013-09-15T06:33:53Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9348862

Parents:

dd7078c (diff), 1c0cef0 (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.

Major conflicts in USB HC drivers.
Compiles and UHCI works (qemu).
OHCI has device remove problems.

File:

• uspace/srv/hid/output/output.c (modified) (11 diffs)

uspace/srv/hid/output/output.c

@@ -82 +82 @@
         int ret = EOK;
         
-        list_foreach(outdevs, link) {
-                outdev_t *dev = list_get_instance(link, outdev_t, link);
-                
+        list_foreach(outdevs, link, outdev_t, dev) {
                 assert(dev->ops.yield);
                 
@@ -99 +97 @@
         int ret = EOK;
         
-        list_foreach(outdevs, link) {
-                outdev_t *dev = list_get_instance(link, outdev_t, link);
-                
+        list_foreach(outdevs, link, outdev_t, dev) {
                 assert(dev->ops.claim);
                 
@@ -117 +113 @@
         sysarg_t rows = MAX_ROWS;
         
-        list_foreach(outdevs, link) {
-                outdev_t *dev = list_get_instance(link, outdev_t, link);
-                
+        list_foreach(outdevs, link, outdev_t, dev) {
                 cols = min(cols, dev->cols);
                 rows = min(rows, dev->rows);
@@ -131 +125 @@
         console_caps_t caps = 0;
         
-        list_foreach(outdevs, link) {
-                outdev_t *dev = list_get_instance(link, outdev_t, link);
-                
+        list_foreach(outdevs, link, outdev_t, dev) {
                 assert(dev->ops.get_caps);
                 
@@ -145 +137 @@
 {
         frontbuf_t *frontbuf = NULL;
-        list_foreach(frontbufs, link) {
-                frontbuf_t *cur = list_get_instance(link, frontbuf_t, link);
+        list_foreach(frontbufs, link, frontbuf_t, cur) {
                 if (cur == (frontbuf_t *) handle) {
                         frontbuf = cur;
@@ -216 +207 @@
         chargrid_get_cursor(buf, &col, &row);
         
-        list_foreach(outdevs, link) {
-                outdev_t *dev = list_get_instance(link, outdev_t, link);
-                
+        list_foreach(outdevs, link, outdev_t, dev) {
                 assert(dev->ops.cursor_update);
                 
@@ -237 +226 @@
 static void srv_set_style(ipc_callid_t iid, ipc_call_t *icall)
 {
-        list_foreach(outdevs, link) {
-                outdev_t *dev = list_get_instance(link, outdev_t, link);
-                
+        list_foreach(outdevs, link, outdev_t, dev) {
                 dev->attrs.type = CHAR_ATTR_STYLE;
                 dev->attrs.val.style =
@@ -250 +237 @@
 static void srv_set_color(ipc_callid_t iid, ipc_call_t *icall)
 {
-        list_foreach(outdevs, link) {
-                outdev_t *dev = list_get_instance(link, outdev_t, link);
-                
+        list_foreach(outdevs, link, outdev_t, dev) {
                 dev->attrs.type = CHAR_ATTR_INDEX;
                 dev->attrs.val.index.bgcolor =
@@ -267 +252 @@
 static void srv_set_rgb_color(ipc_callid_t iid, ipc_call_t *icall)
 {
-        list_foreach(outdevs, link) {
-                outdev_t *dev = list_get_instance(link, outdev_t, link);
-                
+        list_foreach(outdevs, link, outdev_t, dev) {
                 dev->attrs.type = CHAR_ATTR_RGB;
                 dev->attrs.val.rgb.bgcolor = IPC_GET_ARG1(*icall);
@@ -325 +308 @@
         chargrid_t *buf = (chargrid_t *) frontbuf->data;
         
-        list_foreach(outdevs, link) {
-                outdev_t *dev = list_get_instance(link, outdev_t, link);
-                
+        list_foreach(outdevs, link, outdev_t, dev) {
                 assert(dev->ops.char_update);
                 
@@ -374 +355 @@
         chargrid_t *buf = (chargrid_t *) frontbuf->data;
         
-        list_foreach(outdevs, link) {
-                outdev_t *dev = list_get_instance(link, outdev_t, link);
-                
+        list_foreach(outdevs, link, outdev_t, dev) {
                 assert(dev->ops.char_update);