[haiku-commits] r36414 - haiku/trunk/src/add-ons/kernel/bus_managers/scsi

  • From: axeld@xxxxxxxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Thu, 22 Apr 2010 15:42:14 +0200 (CEST)

Author: axeld
Date: 2010-04-22 15:42:13 +0200 (Thu, 22 Apr 2010)
New Revision: 36414
Changeset: http://dev.haiku-os.org/changeset/36414/haiku

Modified:
   haiku/trunk/src/add-ons/kernel/bus_managers/scsi/bus_raw.c
Log:
* Fixed warnings.


Modified: haiku/trunk/src/add-ons/kernel/bus_managers/scsi/bus_raw.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/scsi/bus_raw.c  2010-04-22 
12:58:03 UTC (rev 36413)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/scsi/bus_raw.c  2010-04-22 
13:42:13 UTC (rev 36414)
@@ -3,8 +3,10 @@
  * Distributed under the terms of the MIT License.
  */
 
+
 //!    Devfs entry for raw bus access.
 
+
 #include "scsi_internal.h"
 
 #include <stdlib.h>
@@ -24,8 +26,9 @@
 
 
 static status_t
-scsi_bus_raw_init(device_node *node, void **cookie)
+scsi_bus_raw_init(void *driverCookie, void **_cookie)
 {
+       device_node *node = (device_node *)driverCookie;
        device_node *parent;
        bus_raw_info *bus;
 
@@ -40,7 +43,7 @@
 
        bus->node = node;
 
-       *cookie = bus;
+       *_cookie = bus;
        return B_OK;
 }
 
@@ -53,7 +56,7 @@
 
 
 static status_t
-scsi_bus_raw_open(void *bus, const char *path, uint32 flags,
+scsi_bus_raw_open(void *bus, const char *path, int openMode,
        void **handle_cookie)
 {
        *handle_cookie = bus;
@@ -76,7 +79,7 @@
 
 
 static status_t
-scsi_bus_raw_control(void *_cookie, int32 op, void *data, size_t length)
+scsi_bus_raw_control(void *_cookie, uint32 op, void *data, size_t length)
 {
        bus_raw_info *bus = _cookie;
 


Other related posts:

  • » [haiku-commits] r36414 - haiku/trunk/src/add-ons/kernel/bus_managers/scsi - axeld