[haiku-commits] r39784 - haiku/trunk/src/add-ons/kernel/drivers/ports/usb_serial
- From: revol@xxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Thu, 9 Dec 2010 01:40:25 +0100 (CET)
Author: mmu_man
Date: 2010-12-09 01:40:25 +0100 (Thu, 09 Dec 2010)
New Revision: 39784
Changeset: http://dev.haiku-os.org/changeset/39784
Modified:
haiku/trunk/src/add-ons/kernel/drivers/ports/usb_serial/Driver.h
haiku/trunk/src/add-ons/kernel/drivers/ports/usb_serial/SerialDevice.cpp
haiku/trunk/src/add-ons/kernel/drivers/ports/usb_serial/Tracing.cpp
haiku/trunk/src/add-ons/kernel/drivers/ports/usb_serial/Tracing.h
Log:
Fix gcc4 build:
- use new(std::nothrow) from <new> since we dropped kernel_cpp.h,
- fix "declared 'extern' and later 'static'" warning,
- fix "deprecated conversion from string constant to 'char*'" warning in
tracing code.
Modified: haiku/trunk/src/add-ons/kernel/drivers/ports/usb_serial/Driver.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/ports/usb_serial/Driver.h
2010-12-09 00:11:15 UTC (rev 39783)
+++ haiku/trunk/src/add-ons/kernel/drivers/ports/usb_serial/Driver.h
2010-12-09 00:40:25 UTC (rev 39784)
@@ -90,15 +90,6 @@
bool usb_serial_service(struct tty *tty, uint32 op, void *buffer,
size_t length);
-status_t usb_serial_open(const char *name, uint32 flags, void **cookie);
-status_t usb_serial_read(void *cookie, off_t position, void *buffer,
size_t *numBytes);
-status_t usb_serial_write(void *cookie, off_t position, const void
*buffer, size_t *numBytes);
-status_t usb_serial_control(void *cookie, uint32 op, void *arg, size_t
length);
-status_t usb_serial_select(void *cookie, uint8 event, uint32 ref,
selectsync *sync);
-status_t usb_serial_deselect(void *coookie, uint8 event, selectsync
*sync);
-status_t usb_serial_close(void *cookie);
-status_t usb_serial_free(void *cookie);
-
const char **publish_devices();
device_hooks *find_device(const char *name);
}
Modified:
haiku/trunk/src/add-ons/kernel/drivers/ports/usb_serial/SerialDevice.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/ports/usb_serial/SerialDevice.cpp
2010-12-09 00:11:15 UTC (rev 39783)
+++ haiku/trunk/src/add-ons/kernel/drivers/ports/usb_serial/SerialDevice.cpp
2010-12-09 00:40:25 UTC (rev 39784)
@@ -5,6 +5,8 @@
* Copyright (c) 2003 by Siarzhuk Zharski <imker@xxxxxx>
* Distributed under the terms of the MIT License.
*/
+#include <new>
+
#include "SerialDevice.h"
#include "USB3.h"
@@ -637,7 +639,7 @@
if (!description)
break;
- return new ProlificDevice(device, vendorID, productID,
description);
+ return new(std::nothrow) ProlificDevice(device,
vendorID, productID, description);
}
case VENDOR_FTDI:
@@ -650,7 +652,7 @@
if (!description)
break;
- return new FTDIDevice(device, vendorID, productID,
description);
+ return new(std::nothrow) FTDIDevice(device, vendorID,
productID, description);
}
case VENDOR_PALM:
@@ -664,9 +666,9 @@
if (!description)
break;
- return new KLSIDevice(device, vendorID, productID,
description);
+ return new(std::nothrow) KLSIDevice(device, vendorID,
productID, description);
}
}
- return new ACMDevice(device, vendorID, productID, "CDC ACM compatible
device");
+ return new(std::nothrow) ACMDevice(device, vendorID, productID, "CDC
ACM compatible device");
}
Modified: haiku/trunk/src/add-ons/kernel/drivers/ports/usb_serial/Tracing.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/ports/usb_serial/Tracing.cpp
2010-12-09 00:11:15 UTC (rev 39783)
+++ haiku/trunk/src/add-ons/kernel/drivers/ports/usb_serial/Tracing.cpp
2010-12-09 00:40:25 UTC (rev 39784)
@@ -70,7 +70,7 @@
void
-usb_serial_trace(bool force, char *format, ...)
+usb_serial_trace(bool force, const char *format, ...)
{
if (!gLogEnabled && !force)
return;
Modified: haiku/trunk/src/add-ons/kernel/drivers/ports/usb_serial/Tracing.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/ports/usb_serial/Tracing.h
2010-12-09 00:11:15 UTC (rev 39783)
+++ haiku/trunk/src/add-ons/kernel/drivers/ports/usb_serial/Tracing.h
2010-12-09 00:40:25 UTC (rev 39784)
@@ -10,7 +10,7 @@
void load_settings();
void create_log_file();
-void usb_serial_trace(bool force, char *format, ...);
+void usb_serial_trace(bool force, const char *format, ...);
#define TRACE_ALWAYS(x...) usb_serial_trace(true, x);
#define TRACE(x...) usb_serial_trace(false, x);
Other related posts:
- » [haiku-commits] r39784 - haiku/trunk/src/add-ons/kernel/drivers/ports/usb_serial - revol
