depau/libfprint
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

cleanup: Remove fp_internal.h and update drivers_api.h

Browse source 
Remove the uneeded internal API, as we can now include each header directly
if needed, while move the assembling stuff to the drivers API.
This commit is contained in:
Marco Trevisan (Treviño) 2019-12-16 20:37:15 +01:00
parent 806ad10673
commit 10945f8546
5 changed files with 9 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/meson.build
View file

@ -4,7 +4,6 @@ private_headers = [
'config.h', 'config.h',
'nbis-helpers.h', 'nbis-helpers.h',
'fprint.h', 'fprint.h',
'fp_internal.h',
# Subdirectories to ignore # Subdirectories to ignore
'drivers', 'drivers',

4
libfprint/drivers/aeslib.c
View file

@ -19,13 +19,11 @@
#define FP_COMPONENT "aeslib" #define FP_COMPONENT "aeslib"
#include "fp_internal.h" #include "drivers_api.h"
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
#include "fpi-usb-transfer.h"
#include "fpi-assembling.h"
#include "aeslib.h" #include "aeslib.h"
#define MAX_REGWRITES_PER_REQUEST 16 #define MAX_REGWRITES_PER_REQUEST 16

12
libfprint/drivers_api.h
View file

@ -2,6 +2,7 @@
* Driver API definitions * Driver API definitions
* Copyright (C) 2007-2008 Daniel Drake <dsd@gentoo.org> * Copyright (C) 2007-2008 Daniel Drake <dsd@gentoo.org>
* Copyright (C) 2018 Bastien Nocera <hadess@hadess.net> * Copyright (C) 2018 Bastien Nocera <hadess@hadess.net>
* Copyright (C) 2019 Marco Trevisan <marco.trevisan@canonical.com>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
@ -21,14 +22,13 @@
#ifndef __DRIVERS_API_H__ #ifndef __DRIVERS_API_H__
#define __DRIVERS_API_H__ #define __DRIVERS_API_H__
#include <config.h> #include "fpi-assembling.h"
#include "fpi-device.h"
#include "fp_internal.h" #include "fpi-image-device.h"
#include "fpi-image.h"
#include "fpi-log.h" #include "fpi-log.h"
#include "fpi-print.h"
#include "fpi-usb-transfer.h" #include "fpi-usb-transfer.h"
#include "fpi-ssm.h" #include "fpi-ssm.h"
#include "fpi-assembling.h"
#include "fpi-image-device.h"
#endif #endif

25
libfprint/fp_internal.h
View file

@ -1,25 +0,0 @@
/*
* Internal/private definitions for libfprint
* Copyright (C) 2019 Marco Trevisan <marco.trevisan@canonical.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#pragma once
#include "fpi-log.h"
#include "fpi-image.h"
#include "fpi-image-device.h"
#include "fpi-minutiae.h"

3
libfprint/fpi-assembling.c
View file

@ -21,7 +21,8 @@
#define FP_COMPONENT "assembling" #define FP_COMPONENT "assembling"
#include "fp_internal.h" #include "fpi-log.h"
#include "fpi-image.h"
#include <string.h> #include <string.h>