Date: Sat, 21 Sep 2019 15:24:36 +0000 (UTC) From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r512513 - in head/sysutils/consolehm: . files Message-ID: <201909211524.x8LFOaFQ053307@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pkubaj Date: Sat Sep 21 15:24:36 2019 New Revision: 512513 URL: https://svnweb.freebsd.org/changeset/ports/512513 Log: sysutils/consolehm: fix build on non-x86 outb requires including machine/pio.h and sys/types.h (for uint8_t). Approved by: linimon (mentor) Differential Revision: https://reviews.freebsd.org/D21633 Modified: head/sysutils/consolehm/Makefile head/sysutils/consolehm/files/patch-chm.c Modified: head/sysutils/consolehm/Makefile ============================================================================== --- head/sysutils/consolehm/Makefile Sat Sep 21 15:23:32 2019 (r512512) +++ head/sysutils/consolehm/Makefile Sat Sep 21 15:24:36 2019 (r512513) @@ -10,9 +10,6 @@ MASTER_SITES= LOCAL/fenner MAINTAINER= ports@FreeBSD.org COMMENT= Console based hardware monitor for FreeBSD -ONLY_FOR_ARCHS= i386 amd64 -ONLY_FOR_ARCHS_REASON= uses x86-only assembly from machine/cpufunc.h - USES= uidfix GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/consolehm/consolehm Modified: head/sysutils/consolehm/files/patch-chm.c ============================================================================== --- head/sysutils/consolehm/files/patch-chm.c Sat Sep 21 15:23:32 2019 (r512512) +++ head/sysutils/consolehm/files/patch-chm.c Sat Sep 21 15:24:36 2019 (r512513) @@ -1,14 +1,18 @@ ---- chm.c.orig 2000-12-23 07:51:45.000000000 +0100 -+++ chm.c 2015-05-01 22:23:03.577465000 +0200 -@@ -25,6 +25,7 @@ +--- chm.c.orig 2000-12-23 06:51:45 UTC ++++ chm.c +@@ -25,6 +25,11 @@ * */ +#include <osreldate.h> ++#if (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) && defined(__FreeBSD__) ++#include <sys/types.h> ++#include <machine/pio.h> ++#endif #include "chm.h" static int io_file; -@@ -165,6 +165,7 @@ +@@ -165,6 +170,7 @@ int main (int argc, char **argv) printf("Delay: %d microseconds. \n\n",delay); break; default: @@ -16,7 +20,7 @@ } file_handle = OpenIO(); -@@ -279,7 +280,12 @@ +@@ -279,7 +285,12 @@ int OpenIO() u_char smb_return; struct smbcmd cmd; cmd.slave=0x5a; @@ -29,7 +33,7 @@ if((open_smb=open("/dev/smb0",000))<0){ fprintf(stderr, "Failed to open /dev/smb0.\n"); exit (-1); -@@ -315,7 +321,12 @@ +@@ -315,7 +326,12 @@ int ReadByte(u_char *return_value, int addr) u_char smb_return; struct smbcmd cmd; cmd.slave=0x5a; @@ -42,7 +46,7 @@ cmd.cmd=addr; if(ioctl(open_smb,SMB_READB,&cmd)==-1){ perror("IOCTL"); -@@ -342,9 +353,13 @@ +@@ -342,9 +358,13 @@ int WriteByte(int addr, int value) u_char smb_return; struct smbcmd cmd; cmd.slave=0x5a;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909211524.x8LFOaFQ053307>