Changeset 97c7682 in mainline for uspace/drv/bus

Timestamp:

2012-07-14T11:18:40Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

804d9b6

Parents:

0747468 (diff), f0348c8 (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.

Text conflict in boot/arch/arm32/Makefile.inc:

Trivial conflict around ifeq condition.

Text conflict in kernel/arch/arm32/include/mm/page.h:

Added defines and set_pt_levelx_present function.
COnflict looked horrible because of the armv4/v7 split.

Location:

uspace/drv/bus

Files:

• isa/isa.c (modified) (2 diffs)
• usb/ehci/res.c (modified) (2 diffs)
• usb/ohci/utils/malloc32.h (modified) (1 diff)
• usb/uhci/res.c (modified) (2 diffs)
• usb/uhci/utils/malloc32.h (modified) (2 diffs)
• usb/usbmast/main.c (modified) (1 diff)
• usb/vhc/conndev.c (modified) (1 diff)

uspace/drv/bus/isa/isa.c

@@ -201 +201 @@
 
         isa_fun_t *fun = ddf_fun_data_alloc(fnode, sizeof(isa_fun_t));
-        if (fun == NULL)
+        if (fun == NULL) {
+                ddf_fun_destroy(fnode);
                 return NULL;
+        }
 
         fibril_mutex_initialize(&fun->mutex);
@@ -552 +554 @@
 
         isa_fun_t *fun = isa_fun_create(isa, fun_name);
+        free(fun_name);
         if (fun == NULL) {
-                free(fun_name);
                 return NULL;
         }

uspace/drv/bus/usb/ehci/res.c

@@ -109 +109 @@
         return EOK;
 }
-/*----------------------------------------------------------------------------*/
+
 /** Calls the PCI driver with a request to enable interrupts
  *
@@ -127 +127 @@
         return enabled ? EOK : EIO;
 }
-/*----------------------------------------------------------------------------*/
+
 /** Implements BIOS hands-off routine as described in EHCI spec
  *

uspace/drv/bus/usb/ohci/utils/malloc32.h

@@ -37 +37 @@
 #include <assert.h>
 #include <malloc.h>
+#include <unistd.h>
 #include <errno.h>
 #include <mem.h>

uspace/drv/bus/usb/uhci/res.c

@@ -86 +86 @@
         return EOK;
 }
-/*----------------------------------------------------------------------------*/
+
 /** Call the PCI driver with a request to enable interrupts
  *
@@ -105 +105 @@
         return enabled ? EOK : EIO;
 }
-/*----------------------------------------------------------------------------*/
+
 /** Call the PCI driver with a request to clear legacy support register
  *

uspace/drv/bus/usb/uhci/utils/malloc32.h

@@ -36 +36 @@
 
 #include <assert.h>
+#include <unistd.h>
 #include <errno.h>
 #include <malloc.h>
@@ -98 +99 @@
 static inline void * get_page(void)
 {
-        void *address = as_area_create((void *) -1, UHCI_REQUIRED_PAGE_SIZE,
+        void *address = as_area_create(AS_AREA_ANY, UHCI_REQUIRED_PAGE_SIZE,
             AS_AREA_READ | AS_AREA_WRITE);
-        if (address == (void *) -1)
+        if (address == AS_MAP_FAILED)
                 return NULL;
         

uspace/drv/bus/usb/usbmast/main.c

@@ -302 +302 @@
         
         (void) async_share_out_finalize(callid, &comm_buf);
-        if (comm_buf == (void *) -1) {
+        if (comm_buf == AS_MAP_FAILED) {
                 async_answer_0(callid, EHANGUP);
                 return;

uspace/drv/bus/usb/vhc/conndev.c

@@ -69 +69 @@
         
         if (data_request == 0) {
-                async_wait_for(opening_request, NULL);
+                async_forget(opening_request);
                 return;
         }