mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 01:39:16 -04:00
Fix build on HEAD after SMBus change (r281985/r282256).
Approved by: mentors (implicit)
This commit is contained in:
parent
0d1f07faa8
commit
b0fb6b805f
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=385148
1 changed files with 45 additions and 0 deletions
45
sysutils/healthd/files/patch-getSMB-smb.c
Normal file
45
sysutils/healthd/files/patch-getSMB-smb.c
Normal file
|
@ -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);
|
Loading…
Add table
Reference in a new issue