svn commit: r385148 - head/sysutils/healthd/files

[Michael Gmelin]

Author: grembo
Date: Fri May  1 21:14:01 2015
New Revision: 385148
URL: https://svnweb.freebsd.org/changeset/ports/385148

Log:
  Fix build on HEAD after SMBus change (r281985/r282256).
  
  Approved by:    mentors (implicit)

Added:
  head/sysutils/healthd/files/patch-getSMB-smb.c   (contents, props changed)

Added: head/sysutils/healthd/files/patch-getSMB-smb.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/healthd/files/patch-getSMB-smb.c	Fri May  1 21:14:01 2015	(r385148)
@@ -0,0 +1,45 @@
+--- getMB-smb.c.orig	2004-08-17 03:32:39.000000000 +0200
++++ getMB-smb.c	2015-05-01 22:56:04.200695000 +0200
+@@ -31,6 +31,7 @@
+ #endif
+ 
+ #ifdef HAVE_SMBUS
++#include <osreldate.h>
+ #include <fcntl.h>
+ #include <sys/types.h>
+ #include <sys/ioctl.h>
+@@ -90,7 +91,9 @@
+   }
+ 
+   cmd.cmd = 0x47;
++#if (__FreeBSD_version < 1100071)
+   cmd.data.byte_ptr = &byte;
++#endif
+   for (i = 0; i < sizeof(addrs); i++) {
+     cmd.slave = addrs[i];
+     if (ioctl(iosmb, SMB_READB, (caddr_t)&cmd) != -1) {
+@@ -115,7 +118,11 @@
+   count = 0;
+   cmd.slave = smb_addr;
+   cmd.cmd = addr;
++#if (__FreeBSD_version >= 1100071)
++  cmd.wdata.byte = value;
++#else
+   cmd.data.byte = value;
++#endif
+   while (ioctl(iosmb, SMB_WRITEB, &cmd) == -1) {
+     if (++count < 3) {
+       sleep(1);
+@@ -136,7 +143,12 @@
+ 
+   cmd.slave = smb_addr;
+   cmd.cmd = addr;
++#if (__FreeBSD_version >= 1100071)
++  cmd.rbuf = &ret; 
++  cmd.rcount = 1;
++#else
+   cmd.data.byte_ptr = &ret;
++#endif
+   while (ioctl(iosmb, SMB_READB, &cmd) == -1) {
+     if (++count < 3) {
+       sleep(1);