smartmontools: build fix for FreeBSD-11 and newer.

don't redefine now existing things, nvme_command and ATA_SET_FEATURES


(maya)

$NetBSD: patch-atacmds.h,v 1.1 2016/11/04 17:55:37 maya Exp $

don't redefine ATA_SET_FEATURES if it's already defined
build fix for FreeBSD-11

--- atacmds.h.orig	2015-10-31 09:36:16.000000000 -0700
+++ atacmds.h	2016-06-15 19:39:43.425233000 -0700
@@ -74,7 +74,9 @@
 #define ATA_IDLE                        0xe3
 #define ATA_SMART_CMD                   0xb0
 #define ATA_SECURITY_FREEZE_LOCK        0xf5
+#ifndef ATA_SET_FEATURES
 #define ATA_SET_FEATURES                0xef
+#endif
 #define ATA_STANDBY_IMMEDIATE           0xe0
 
 // SET_FEATURES subcommands

$NetBSD: patch-freebsd_nvme_ioctl.h,v 1.1 2016/11/04 17:55:37 maya Exp $

Don't redefine nvme_command on newer FreeBSD

--- freebsd_nvme_ioctl.h.orig	2016-03-28 09:25:56.000000000 -0700
+++ freebsd_nvme_ioctl.h	2016-06-15 20:43:22.389493000 -0700
@@ -31,6 +31,7 @@
 
 #define	NVME_PASSTHROUGH_CMD	_IOWR('n', 0, struct nvme_pt_command)
 
+#if __FreeBSD_version < 1100110
 struct nvme_command
 {
 	/* dword 0 */
@@ -143,6 +144,7 @@
 	 */
 	struct mtx *		driver_lock;
 };
+#endif
 
 #define nvme_completion_is_error(cpl)					\
 	((cpl)->status.sc != 0 || (cpl)->status.sct != 0)