* Made C++ safe.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36255 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
fc04fb092c
commit
3856867b03
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2004-2007 Haiku, Inc.
|
||||
* Copyright 2004-2010 Haiku, Inc.
|
||||
* Distributed under the terms of the MIT License.
|
||||
*
|
||||
* PS/2 bus manager
|
||||
@ -46,8 +46,12 @@ extern device_hooks gPointingDeviceHooks;
|
||||
extern bool gActiveMultiplexingEnabled;
|
||||
extern sem_id gControllerSem;
|
||||
|
||||
// prototypes from common.c
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
// prototypes from common.c
|
||||
status_t ps2_init(void);
|
||||
void ps2_uninit(void);
|
||||
|
||||
@ -66,4 +70,9 @@ extern status_t ps2_command(uint8 cmd, const uint8 *out, int out_count,
|
||||
// prototypes from keyboard.c & mouse.c
|
||||
extern status_t probe_keyboard(void);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
#endif /* __PS2_COMMON_H */
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2005-2007 Haiku, Inc.
|
||||
* Copyright 2005-2010 Haiku, Inc.
|
||||
* Distributed under the terms of the MIT License.
|
||||
*
|
||||
* PS/2 bus manager
|
||||
@ -10,6 +10,7 @@
|
||||
#ifndef __PS2_DEV_H
|
||||
#define __PS2_DEV_H
|
||||
|
||||
|
||||
struct ps2_dev;
|
||||
typedef struct ps2_dev ps2_dev;
|
||||
|
||||
@ -59,6 +60,11 @@ extern ps2_dev ps2_device[PS2_DEVICE_COUNT];
|
||||
#define PS2_FLAG_NACK (1 << 5)
|
||||
#define PS2_FLAG_GETID (1 << 6)
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
void ps2_dev_send(ps2_dev *dev, uint8 data);
|
||||
|
||||
status_t ps2_dev_detect_pointing(ps2_dev *dev, device_hooks **hooks);
|
||||
@ -81,4 +87,9 @@ void ps2_dev_unpublish(ps2_dev *dev);
|
||||
|
||||
int32 ps2_dev_handle_int(ps2_dev *dev);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
#endif /* __PS2_DEV_H */
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2005-2007 Haiku, Inc.
|
||||
* Copyright 2005-2010 Haiku, Inc.
|
||||
* Distributed under the terms of the MIT License.
|
||||
*
|
||||
* PS/2 bus manager
|
||||
@ -10,9 +10,15 @@
|
||||
#ifndef __PS2_SERVICE_H
|
||||
#define __PS2_SERVICE_H
|
||||
|
||||
|
||||
#include "ps2_common.h"
|
||||
#include "ps2_dev.h"
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
status_t ps2_service_init(void);
|
||||
void ps2_service_exit(void);
|
||||
|
||||
@ -20,4 +26,9 @@ void ps2_service_notify_device_added(ps2_dev *dev);
|
||||
void ps2_service_notify_device_republish(ps2_dev *dev);
|
||||
void ps2_service_notify_device_removed(ps2_dev *dev);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
#endif /* __PS2_SERVICE_H */
|
||||
|
Loading…
x
Reference in New Issue
Block a user