From 7b6baafd1d22b325aca4c8506caa9b5619c8e1a2 Mon Sep 17 00:00:00 2001 From: Romuald Conty Date: Mon, 27 Jun 2011 08:56:38 +0000 Subject: [PATCH] example/nfc-relay-picc: Move windows related code into contrib/win32 --- contrib/win32/unistd.h | 33 +++++++++++++++++++++++++++++++++ examples/nfc-relay-picc.c | 17 +++-------------- 2 files changed, 36 insertions(+), 14 deletions(-) create mode 100644 contrib/win32/unistd.h diff --git a/contrib/win32/unistd.h b/contrib/win32/unistd.h new file mode 100644 index 0000000..52250f8 --- /dev/null +++ b/contrib/win32/unistd.h @@ -0,0 +1,33 @@ +/*- + * Public platform independent Near Field Communication (NFC) library + * + * Copyright (C) 2011, Romuald Conty + * + * This program 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 3 of the License, or (at your + * option) any later version. + * + * This program 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 General Public License for + * more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see + */ + +/** + * @file unistd.h + * @brief This file intended to serve as a drop-in replacement for unistd.h on Windows + */ + +#ifndef _UNISTD_H_ +#define _UNISTD_H_ + +// Needed by Sleep() under Windows +# include +# define sleep(X) Sleep( X * 1000) + +#endif /* _UNISTD_H_ */ + diff --git a/examples/nfc-relay-picc.c b/examples/nfc-relay-picc.c index b351ca8..b72b940 100644 --- a/examples/nfc-relay-picc.c +++ b/examples/nfc-relay-picc.c @@ -48,23 +48,12 @@ #include #include +#include + #include #include "nfc-utils.h" -// TODO Move this Windows conditional code in contrib/win32/ or contrib/windows.h -#ifndef _WIN32 -// Needed by sleep() under Unix -# include -# define sleep sleep -# define SUSP_TIME 1 // secs. -#else -// Needed by Sleep() under Windows -# include -# define sleep Sleep -# define SUSP_TIME 1000 // msecs. -#endif - #define MAX_FRAME_LEN 264 #define MAX_DEVICE_COUNT 2 @@ -432,7 +421,7 @@ main (int argc, char *argv[]) if (!quiet_output) { printf ("Waiting %is to simulate longer relay...\n", waiting_time); } - sleep(waiting_time * SUSP_TIME); + sleep(waiting_time); } // Show transmitted response if (!quiet_output) {