From ee0be828e4498b353633a6ce13bd19ac99ea99f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 1 Sep 2009 18:48:34 +0000 Subject: [PATCH] * Rewrote USB_printer.h, and bus_manager.h (the last short ones...) :-) git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32895 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/os/drivers/USB_printer.h | 34 +++++++++----------------------- headers/os/drivers/bus_manager.h | 21 +++++--------------- 2 files changed, 14 insertions(+), 41 deletions(-) diff --git a/headers/os/drivers/USB_printer.h b/headers/os/drivers/USB_printer.h index fc4e266d03..2b0bbf67ec 100644 --- a/headers/os/drivers/USB_printer.h +++ b/headers/os/drivers/USB_printer.h @@ -1,36 +1,20 @@ -/* -** USB_printer.h -** -** Copyright 1999, Be Incorporated. All Rights Reserved. -** -*/ - +/* + * Copyright 2009, Haiku Inc. All Rights Reserved. + * Distributed under the terms of the MIT License. + */ #ifndef _USB_PRINTER_H #define _USB_PRINTER_H + #include -#ifdef __cplusplus -extern "C" { -#endif -/* ioctl() opcodes for usb_printer driver */ - -enum -{ - USB_PRINTER_GET_DEVICE_ID = B_DEVICE_OP_CODES_END+1 +enum { + USB_PRINTER_GET_DEVICE_ID = B_DEVICE_OP_CODES_END + 1 }; - -/* Maximum length of the DEVICE_ID. User MUST allocate this size -when calling USB_PRINTER_GET_DEVICE_ID ioctl() */ - #define USB_PRINTER_DEVICE_ID_LENGTH 256 + /* buffer size to be handed to above ioctl() call */ - -#ifdef __cplusplus -} -#endif - -#endif +#endif /* _USB_PRINTER_H */ diff --git a/headers/os/drivers/bus_manager.h b/headers/os/drivers/bus_manager.h index e894f7f0f4..36930e44e6 100644 --- a/headers/os/drivers/bus_manager.h +++ b/headers/os/drivers/bus_manager.h @@ -1,21 +1,13 @@ -/******************************************************************************* -/ -/ File: bus_managers.h -/ -/ Description: bus manager API -/ -/ Copyright 1998, Be Incorporated, All Rights Reserved. -/ -*******************************************************************************/ - +/* + * Copyright 2009, Haiku Inc. All Rights Reserved. + * Distributed under the terms of the MIT License. + */ #ifndef _BUS_MANAGER_H #define _BUS_MANAGER_H + #include -#ifdef __cplusplus -extern "C" { -#endif typedef struct bus_manager_info bus_manager_info; @@ -24,8 +16,5 @@ struct bus_manager_info { status_t (*rescan)(); }; -#ifdef __cplusplus -} -#endif #endif /* _BUS_MANAGER_H */