D22888.diff
No OneTemporary
Actions

Size

897 B

Referenced Files

None

Subscribers

None

D22888.diff
View Options

	Index: head/sbin/camcontrol/camcontrol.c
	===================================================================
	--- head/sbin/camcontrol/camcontrol.c
	+++ head/sbin/camcontrol/camcontrol.c
	@@ -2355,7 +2355,7 @@
	if (arglist & CAM_ARG_VERBOSE) {
	printf("%s%d: Raw identify data:\n",
	device->device_name, device->dev_unit_num);
	- dump_data((void*)ident_buf, sizeof(struct ata_params));
	+ dump_data((uint16_t *)ident_buf, sizeof(struct ata_params));
	}

	if (ident_buf->support.command1 & ATA_SUPPORT_PROTECTED) {
	Index: head/sys/sys/ata.h
	===================================================================
	--- head/sys/sys/ata.h
	+++ head/sys/sys/ata.h
	@@ -311,7 +311,7 @@
	/223/ u_int16_t transport_minor;
	u_int16_t reserved224[31];
	/255/ u_int16_t integrity;
	-} __packed;
	+} __packed __aligned(2);

	/* ATA Dataset Management */
	#define ATA_DSM_BLK_SIZE 512