rainlance/amiga-ntimed
1
0
Fork 0
mirror of https://frontier.innolan.net/rainlance/amiga-ntimed.git synced 2025-11-21 03:23:18 +00:00
Code Releases Activity

Refactored compiler and platform logic

Browse Source
This commit is contained in:
llsth
2015-03-17 10:02:28 +01:00
parent 9e91ea0295
commit d361fc7ec7
12 changed files with 170 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
agetaddrinfo.c
View File

@ -77,7 +77,7 @@
#include <arpa/inet.h>
#include <netdb.h>
#include "atimed.h"
#include "ntimed.h"
#include "agetaddrinfo.h"
#if defined(STDC_HEADERS) || defined(HAVE_STRING_H)

1
agetaddrinfo.h
View File

@ -31,7 +31,6 @@
#include <sys/types.h>
#include <netdb.h>
#include "atimed.h"
/********************************************************************/
/*

1
combine_delta.c
View File

@ -48,7 +48,6 @@
#include <string.h>
#include "ntimed.h"
#include "atimed.h"
struct cd_stat {
double x;

96
compiler.h Normal file
View File

@ -0,0 +1,96 @@
/*
* Copyright (c) 2015 Carsten Larsen
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
#ifndef NTIMED_COMPILER_H
#define NTIMED_COMPILER_H
/*
* See alse:
* http://codewiz.org/projects/amiga/Headers/CompilerSpecific.h
*
*/
#ifdef __VBCC__
#include <stdint.h>
#include <sys/socket.h>
#define nan(p) NAN
#define __inline
#define __printflike(a, b)
#define round(x) x > 0.0 ? floor(x + 0.5) : ceil(x - 0.5)
typedef uint32_t register_t;
#endif
#ifdef __GNUC__
#ifdef AOS3
/*
* GCC 2.95.3
*/
#include <machine/limits.h>
#include <machine/types.h>
#include <math.h>
typedef unsigned char uint8_t;
typedef unsigned short uint16_t;
typedef unsigned int uint32_t;
typedef unsigned long long uint64_t;
typedef uint32_t uintptr_t;
static inline double
round(double x)
{
return x > 0.0 ? floor(x + 0.5) : ceil(x - 0.5);
}
#define nan(p) 0./0.
#endif
#ifdef AROS
#include <stdint.h>
typedef uint32_t register_t;
#endif
#endif
#ifndef _ALIGNBYTES
#define _ALIGNBYTES (sizeof(register_t) - 1)
#define ALIGN(p) (((uintptr_t)(p) + _ALIGNBYTES) & ~_ALIGNBYTES)
#endif
#ifdef __GNUC__
typedef unsigned int sa_family_t;
typedef unsigned int socklen_t;
typedef uint16_t in_port_t;
#endif
// General socket address holding structure, big enough to hold either
// struct sockaddr_in or struct sockaddr_in6 data:
struct sockaddr_storage {
sa_family_t ss_family; // address family
// all this is padding, implementation specific, ignore it:
char __ss_pad1[128 - sizeof(sa_family_t)];
};
#endif

5
configure vendored
View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# Copyright (c) 2014 Carsten Larsen
# Copyright (c) 2015 Carsten Larsen
# Copyright (c) 2014 Poul-Henning Kamp
# All rights reserved.
#
@ -41,9 +41,10 @@ set -e
# NB: These SHALL always be included with #include "..."
HDRS='
atimed.h
compiler.h
ntimed.h
ntimed_endian.h
ntimed_platform.h
ntimed_queue.h
ntimed_tricks.h
ntp.h

1
main.c
View File

@ -30,7 +30,6 @@
#include <string.h>
#include "atimed.h"
#include "ntimed.h"
#include "ntp.h"

1
main_client.c
View File

@ -38,7 +38,6 @@
#include <sys/socket.h>
#include "tz.h"
#include "atimed.h"
#include "ntimed.h"
#include "ntp.h"
#include "udp.h"

1
main_poll_server.c
View File

@ -35,7 +35,6 @@
#include <stdlib.h>
#include <sys/socket.h>
#include "atimed.h"
#include "ntimed.h"
#include "ntp.h"
#include "udp.h"

2
ntimed.h
View File

@ -32,7 +32,7 @@
#endif
#define NTIMED_H_INCLUDED
#include "atimed.h"
#include "compiler.h"
#include <unistd.h>
#include "ntimed_queue.h"

69
ntimed_platform.h Normal file
View File

@ -0,0 +1,69 @@
/*
* Copyright (c) 2015 Carsten Larsen
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
#ifndef NTIMED_PLATFROM_H
#define NTIMED_PLATFROM_H
#if defined(AROS) || defined(AOS3)
#ifndef AMIGA
#define AMIGA
#endif
#endif
#define ARGSFORMAT "P=PARAM/K,T=TRACEFILE/K,Z=TIMEZONE/K,SERVERS/M,SYNC/S,SAVE/S,QUIET/S"
#ifdef AOS3
#define ARGPTR STRPTR
#define ARGS_FORMAT ARGSFORMAT
#define BSDLIB_NAME "bsdsocket.library"
#define BSDLIB_REV 04L
#define UTILLIB_NAME "utility.library"
#define UTILLIB_REV 33L
#define TIMER_NAME TIMERNAME
#define BATTCLOCK_NAME BATTCLOCKNAME
#endif
#ifdef AROS
#define ARGPTR CONST_STRPTR
#define ARGS_FORMAT (CONST_STRPTR)ARGSFORMAT
#define BSDLIB_NAME (CONST_STRPTR)"bsdsocket.library"
#define BSDLIB_REV 04L
#define UTILLIB_NAME (CONST_STRPTR)"utility.library"
#define UTILLIB_REV 33L
#define TIMER_NAME (CONST_STRPTR)TIMERNAME
#define BATTCLOCK_NAME (CONST_STRPTR)BATTCLOCKNAME
#define APRT IPRT
#endif
void amiga_save_time(void);
void create_wait_timer(void);
void delete_wait_timer(void);
#define Time_Amiga_Save amiga_save_time
#define CreateWaitTimer create_wait_timer
#define DeleteWaitTimer delete_wait_timer
#endif

1
time_stuff.c
View File

@ -36,7 +36,6 @@
#include <string.h>
#include "ntimed.h"
#include "atimed.h"
#define NANO_FRAC 18446744074ULL // 2^64 / 1e9

2
udp.c
View File

@ -41,8 +41,6 @@
#include "ntimed.h"
#include "udp.h"
#include "atimed.h"
#include "apoll.h"
struct udp_socket {