mangavalk/lcdproc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

enable building lcdproc client on FreeBSD AMD64 platform (M. Dolze)

Browse Source
This commit is contained in:
marschap
2007-08-26 21:07:42 +00:00
parent 2346dcccc2
commit 150b089d08
4 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+2 -1
View File
@@ -20,7 +20,8 @@ v.0.5dev (ongoing development)
* MtxOrb driver: fix VFD/VKD support (Ethan Dicks) * MtxOrb driver: fix VFD/VKD support (Ethan Dicks)
+ new driver lis for VLSystem L.I.S VFD (Daryl Fonseca-Holt) + new driver lis for VLSystem L.I.S VFD (Daryl Fonseca-Holt)
* serialPOS driver: input support, cleanup (Eric Pooch) * serialPOS driver: input support, cleanup (Eric Pooch)
* new driver shuttleVFD for USB-based Shuttle VFDs (Thien Vu) + new driver shuttleVFD for USB-based Shuttle VFDs (Thien Vu)
* enable building lcdproc client on FreeBSD AMD64 platform (M. Dolze)
v.0.5.2 v.0.5.2
* fix switching on/off the Load screen in lcdproc client using the menu * fix switching on/off the Load screen in lcdproc client using the menu
clients/lcdproc/machine_FreeBSD.c
+14 -6
View File
@@ -45,16 +45,22 @@
#include <sys/mount.h> #include <sys/mount.h>
#include <sys/time.h> #include <sys/time.h>
#include <sys/user.h> #include <sys/user.h>
#include <machine/apm_bios.h>
#include <kvm.h> #include <kvm.h>
#include <errno.h> #include <errno.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <net/if.h> #include <net/if.h>
#include <net/if_mib.h> #include <net/if_mib.h>
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#ifdef HAVE_MACHINE_APM_BIOS_H
# include <machine/apm_bios.h>
#endif
#include "main.h" #include "main.h"
#include "machine.h" #include "machine.h"
#include "config.h"
#include "shared/LL.h" #include "shared/LL.h"
static int pageshift; static int pageshift;
@@ -86,13 +92,14 @@ int machine_close(void)
int machine_get_battstat(int *acstat, int *battflag, int *percent) int machine_get_battstat(int *acstat, int *battflag, int *percent)
{ {
int apmd;
struct apm_info aip;
*acstat = LCDP_AC_ON; *acstat = LCDP_AC_ON;
*battflag = LCDP_BATT_ABSENT; *battflag = LCDP_BATT_ABSENT;
*percent = 100; *percent = 100;
#ifdef HAVE_MACHINE_APM_BIOS_H
int apmd;
struct apm_info aip;
if ((apmd = open("/dev/apm", O_RDONLY)) == -1) if ((apmd = open("/dev/apm", O_RDONLY)) == -1)
{ {
perror("get_battstat_open"); perror("get_battstat_open");
@@ -142,6 +149,7 @@ int machine_get_battstat(int *acstat, int *battflag, int *percent)
*percent = -1; *percent = -1;
close(apmd); close(apmd);
#endif
return(TRUE); return(TRUE);
} }
@@ -197,7 +205,7 @@ int machine_get_load(load_type *curr_load)
static load_type last_load = { 0, 0, 0, 0, 0 }; static load_type last_load = { 0, 0, 0, 0, 0 };
static load_type last_ret_load; static load_type last_ret_load;
load_type load; load_type load;
u_int32_t cp_time[CPUSTATES]; long cp_time[CPUSTATES];
size_t size; size_t size;
size = sizeof(cp_time); size = sizeof(cp_time);
clients/lcdproc/machine_Linux.c
+4 -1
View File
@@ -15,6 +15,10 @@
#include <sys/statvfs.h> #include <sys/statvfs.h>
#include <errno.h> #include <errno.h>
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#if TIME_WITH_SYS_TIME #if TIME_WITH_SYS_TIME
# include <sys/time.h> # include <sys/time.h>
# include <time.h> # include <time.h>
@@ -47,7 +51,6 @@
#include "main.h" #include "main.h"
#include "mode.h" #include "mode.h"
#include "machine.h" #include "machine.h"
#include "config.h"
#include "shared/LL.h" #include "shared/LL.h"
configure.in
+1 -1
View File
@@ -107,7 +107,7 @@ AC_CHECK_LIB(kvm, kvm_open,[
]) ])
dnl NetBSD, OpenBSD and FreeBSD dnl NetBSD, OpenBSD and FreeBSD
AC_CHECK_HEADERS(sched.h sys/sched.h machine/cpufunc.h sys/types.h machine/pio.h machine/sysarch.h sys/cpuvar.h) AC_CHECK_HEADERS(sched.h sys/sched.h machine/cpufunc.h sys/types.h machine/pio.h machine/sysarch.h sys/cpuvar.h machine/apm_bios.h)
ETR_SYSV_IPC ETR_SYSV_IPC
ETR_UNION_SEMUN ETR_UNION_SEMUN