Attachment #119347 for bug #161859

View | Details | Raw Unified | Return to bug 161859
Collapse All | Expand All

Lines 6-13 Link Here

(-)/root/smartmontools/Makefile (-2 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= smartmontools	8	PORTNAME= smartmontools
9	PORTVERSION= 5.41	9	PORTVERSION= 5.42
10	PORTREVISION= 3
11	CATEGORIES= sysutils	10	CATEGORIES= sysutils
12	MASTER_SITES= SF	11	MASTER_SITES= SF
13		12

Lines 1-2 Link Here

(-)/root/smartmontools/distinfo (-2 / +2 lines)
1	SHA256 (smartmontools-5.41.tar.gz) = 173eb14e3253a30230f38c7e684085bcae7fa021efff58bdf94c2702ac76fa32	1	SHA256 (smartmontools-5.42.tar.gz) = ee9760064fdd0727a111dc5fef2b748b951ac21df4a09ea513acdb353e9e37b3
2	SIZE (smartmontools-5.41.tar.gz) = 740661	2	SIZE (smartmontools-5.42.tar.gz) = 740025




$FreeBSD: ports/sysutils/smartmontools/files/patch-os_freebsd,v 1.1 2011/09/27 18:59:51 crees Exp $

This patch from upstream address 2 issues:

1) SMART health status is always "GOOD" with atacam driver.
2) Command "-l scterc" is broken on ata and atacam drivers.

See https://sourceforge.net/apps/trac/smartmontools/ticket/198 for more
details.

NOTE: Path stripped from filename to make make patch work, but otherwise
identical to the patch in the ticket.

Index: trunk/smartmontools/os_freebsd.cpp
===================================================================
--- os_freebsd.cpp (revision 3407)
+++ os_freebsd.cpp (revision 3421)
@@ -288,10 +288,10 @@
       break;
     case ata_cmd_in::data_in:  
-      request.flags=ATA_CMD_READ;
+      request.flags=ATA_CMD_READ | ATA_CMD_CONTROL;
       request.data=(char *)in.buffer;
       request.count=in.size;
       break;
     case ata_cmd_in::data_out: 
-      request.flags=ATA_CMD_WRITE;
+      request.flags=ATA_CMD_WRITE | ATA_CMD_CONTROL;
       request.data=(char *)in.buffer;
       request.count=in.size;
@@ -300,6 +300,6 @@
       return set_err(ENOSYS);
   }
-                          
-  clear_err(); 
+
+  clear_err();
   errno = 0;
   if (do_cmd(&request, in.in_regs.is_48bit_cmd()))
@@ -390,5 +390,5 @@
   if (request->count == 0)
     camflags = CAM_DIR_NONE;
-  else if (request->flags == ATA_CMD_READ)
+  else if (request->flags & ATA_CMD_READ)
     camflags = CAM_DIR_IN;
   else
@@ -406,9 +406,6 @@
                  request->timeout * 1000); // timeout in seconds
 
+  ccb.ataio.cmd.flags = CAM_ATAIO_NEEDRESULT;
   // ata_28bit_cmd
-  if (request->flags == ATA_CMD_CONTROL)
-    ccb.ataio.cmd.flags = CAM_ATAIO_NEEDRESULT;
-  else
-    ccb.ataio.cmd.flags = 0;
   ccb.ataio.cmd.command = request->u.ata.command;
   ccb.ataio.cmd.features = request->u.ata.feature;
@@ -436,5 +433,15 @@
   }
 
-  request->u.ata.count = ccb.ataio.res.sector_count;
+  request->u.ata.lba =
+    ((u_int64_t)(ccb.ataio.res.lba_low)) |
+    ((u_int64_t)(ccb.ataio.res.lba_mid) << 8) |
+    ((u_int64_t)(ccb.ataio.res.lba_high) << 16) |
+    ((u_int64_t)(ccb.ataio.res.lba_low_exp) << 24) |
+    ((u_int64_t)(ccb.ataio.res.lba_mid_exp) << 32) |
+    ((u_int64_t)(ccb.ataio.res.lba_high_exp) << 40);
+
+  request->u.ata.count = ccb.ataio.res.sector_count | (ccb.ataio.res.sector_count_exp << 8);
+  request->error = ccb.ataio.res.error;
+
   return 0;
 }

Return to bug 161859

Lines 1-74 Link Here

(-)/root/smartmontools/files/patch-os_freebsd (-74 lines)
1	$FreeBSD: ports/sysutils/smartmontools/files/patch-os_freebsd,v 1.1 2011/09/27 18:59:51 crees Exp $
2
3	This patch from upstream address 2 issues:
4
5	1) SMART health status is always "GOOD" with atacam driver.
6	2) Command "-l scterc" is broken on ata and atacam drivers.
7
8	See https://sourceforge.net/apps/trac/smartmontools/ticket/198 for more
9	details.
10
11	NOTE: Path stripped from filename to make make patch work, but otherwise
12	identical to the patch in the ticket.
13
14	Index: trunk/smartmontools/os_freebsd.cpp
15	===================================================================
16	--- os_freebsd.cpp (revision 3407)
17	+++ os_freebsd.cpp (revision 3421)
18	@@ -288,10 +288,10 @@
19	break;
20	case ata_cmd_in::data_in:
21	- request.flags=ATA_CMD_READ;
22	+ request.flags=ATA_CMD_READ \| ATA_CMD_CONTROL;
23	request.data=(char *)in.buffer;
24	request.count=in.size;
25	break;
26	case ata_cmd_in::data_out:
27	- request.flags=ATA_CMD_WRITE;
28	+ request.flags=ATA_CMD_WRITE \| ATA_CMD_CONTROL;
29	request.data=(char *)in.buffer;
30	request.count=in.size;
31	@@ -300,6 +300,6 @@
32	return set_err(ENOSYS);
33	}
34	-
35	- clear_err();
36	+
37	+ clear_err();
38	errno = 0;
39	if (do_cmd(&request, in.in_regs.is_48bit_cmd()))
40	@@ -390,5 +390,5 @@
41	if (request->count == 0)
42	camflags = CAM_DIR_NONE;
43	- else if (request->flags == ATA_CMD_READ)
44	+ else if (request->flags & ATA_CMD_READ)
45	camflags = CAM_DIR_IN;
46	else
47	@@ -406,9 +406,6 @@
48	request->timeout * 1000); // timeout in seconds
49
50	+ ccb.ataio.cmd.flags = CAM_ATAIO_NEEDRESULT;
51	// ata_28bit_cmd
52	- if (request->flags == ATA_CMD_CONTROL)
53	- ccb.ataio.cmd.flags = CAM_ATAIO_NEEDRESULT;
54	- else
55	- ccb.ataio.cmd.flags = 0;
56	ccb.ataio.cmd.command = request->u.ata.command;
57	ccb.ataio.cmd.features = request->u.ata.feature;
58	@@ -436,5 +433,15 @@
59	}
60
61	- request->u.ata.count = ccb.ataio.res.sector_count;
62	+ request->u.ata.lba =
63	+ ((u_int64_t)(ccb.ataio.res.lba_low)) \|
64	+ ((u_int64_t)(ccb.ataio.res.lba_mid) << 8) \|
65	+ ((u_int64_t)(ccb.ataio.res.lba_high) << 16) \|
66	+ ((u_int64_t)(ccb.ataio.res.lba_low_exp) << 24) \|
67	+ ((u_int64_t)(ccb.ataio.res.lba_mid_exp) << 32) \|
68	+ ((u_int64_t)(ccb.ataio.res.lba_high_exp) << 40);
69	+
70	+ request->u.ata.count = ccb.ataio.res.sector_count \| (ccb.ataio.res.sector_count_exp << 8);
71	+ request->error = ccb.ataio.res.error;
72	+
73	return 0;
74	}