Fix usage of hid_init and hid_exit
Signed-off-by: Jacki <jacki@thejackimonster.de>
This commit is contained in:
parent
badc712c9b
commit
3914214af0
5 changed files with 103 additions and 4 deletions
|
@ -11,6 +11,7 @@ add_subdirectory(modules/Fusion/Fusion)
|
|||
add_library(
|
||||
nrealAirLibrary
|
||||
src/crc32.c
|
||||
src/device.c
|
||||
src/device3.c
|
||||
src/device4.c
|
||||
src/hid_ids.c
|
||||
|
|
46
interface_lib/include/device.h
Normal file
46
interface_lib/include/device.h
Normal file
|
@ -0,0 +1,46 @@
|
|||
#pragma once
|
||||
//
|
||||
// Created by thejackimonster on 19.12.23.
|
||||
//
|
||||
// Copyright (c) 2023 thejackimonster. All rights reserved.
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
// of this software and associated documentation files (the "Software"), to deal
|
||||
// in the Software without restriction, including without limitation the rights
|
||||
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
// copies of the Software, and to permit persons to whom the Software is
|
||||
// furnished to do so, subject to the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be included in
|
||||
// all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
// THE SOFTWARE.
|
||||
//
|
||||
|
||||
#ifndef __cplusplus
|
||||
#include <stdbool.h>
|
||||
#endif
|
||||
|
||||
#ifndef __cplusplus
|
||||
#include <stdint.h>
|
||||
#else
|
||||
#include <cstdint>
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
bool device_init();
|
||||
|
||||
void device_exit();
|
||||
|
||||
#ifdef __cplusplus
|
||||
} // extern "C"
|
||||
#endif
|
50
interface_lib/src/device.c
Normal file
50
interface_lib/src/device.c
Normal file
|
@ -0,0 +1,50 @@
|
|||
//
|
||||
// Created by thejackimonster on 19.12.23.
|
||||
//
|
||||
// Copyright (c) 2023 thejackimonster. All rights reserved.
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
// of this software and associated documentation files (the "Software"), to deal
|
||||
// in the Software without restriction, including without limitation the rights
|
||||
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
// copies of the Software, and to permit persons to whom the Software is
|
||||
// furnished to do so, subject to the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be included in
|
||||
// all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
// THE SOFTWARE.
|
||||
//
|
||||
|
||||
#include "device.h"
|
||||
|
||||
#include <hidapi/hidapi.h>
|
||||
|
||||
static size_t hid_device_counter = 0;
|
||||
|
||||
bool device_init() {
|
||||
if (0 != hid_init()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
hid_device_counter++;
|
||||
return true;
|
||||
}
|
||||
|
||||
void device_exit() {
|
||||
if (!hid_device_counter) {
|
||||
return;
|
||||
}
|
||||
|
||||
hid_device_counter--;
|
||||
|
||||
if (0 == hid_device_counter) {
|
||||
hid_exit();
|
||||
}
|
||||
}
|
|
@ -23,6 +23,7 @@
|
|||
//
|
||||
|
||||
#include "device3.h"
|
||||
#include "device.h"
|
||||
|
||||
#include <Fusion/FusionAxes.h>
|
||||
#include <Fusion/FusionMath.h>
|
||||
|
@ -198,7 +199,7 @@ device3_error_type device3_open(device3_type* device, device3_event_callback cal
|
|||
device->product_id = 0;
|
||||
device->callback = callback;
|
||||
|
||||
if (0 != hid_init()) {
|
||||
if (!device_init()) {
|
||||
device3_error("Not initialized");
|
||||
return DEVICE3_ERROR_NOT_INITIALIZED;
|
||||
}
|
||||
|
@ -964,7 +965,7 @@ device3_error_type device3_close(device3_type* device) {
|
|||
}
|
||||
|
||||
memset(device, 0, sizeof(device3_type));
|
||||
hid_exit();
|
||||
device_exit();
|
||||
|
||||
return DEVICE3_ERROR_NO_ERROR;
|
||||
}
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
//
|
||||
|
||||
#include "device4.h"
|
||||
#include "device.h"
|
||||
|
||||
#include <stdbool.h>
|
||||
#include <stdint.h>
|
||||
|
@ -177,7 +178,7 @@ device4_error_type device4_open(device4_type* device, device4_event_callback cal
|
|||
device->product_id = 0;
|
||||
device->callback = callback;
|
||||
|
||||
if (0 != hid_init()) {
|
||||
if (!device_init()) {
|
||||
device4_error("Not initialized");
|
||||
return DEVICE4_ERROR_NOT_INITIALIZED;
|
||||
}
|
||||
|
@ -630,7 +631,7 @@ device4_error_type device4_close(device4_type* device) {
|
|||
}
|
||||
|
||||
memset(device, 0, sizeof(device4_type));
|
||||
hid_exit();
|
||||
device_exit();
|
||||
|
||||
return DEVICE4_ERROR_NO_ERROR;
|
||||
}
|
||||
|
|
Reference in a new issue