From 79d6017866067064ba712bf6b913b59695d44a06 Mon Sep 17 00:00:00 2001
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Mon, 28 Jul 2014 18:39:29 +0000
Subject: Rename emulators/ patch-xy patches to reflect the files they modify.

---
 emulators/gxemul/files/patch-aa                    | 32 ----------------------
 emulators/gxemul/files/patch-ab                    | 11 --------
 .../gxemul/files/patch-src_devices_dev_wdc.cc      | 32 ++++++++++++++++++++++
 .../gxemul/files/patch-src_include_refcount_ptr.h  | 11 ++++++++
 4 files changed, 43 insertions(+), 43 deletions(-)
 delete mode 100644 emulators/gxemul/files/patch-aa
 delete mode 100644 emulators/gxemul/files/patch-ab
 create mode 100644 emulators/gxemul/files/patch-src_devices_dev_wdc.cc
 create mode 100644 emulators/gxemul/files/patch-src_include_refcount_ptr.h

(limited to 'emulators/gxemul')

diff --git a/emulators/gxemul/files/patch-aa b/emulators/gxemul/files/patch-aa
deleted file mode 100644
index 752e7f318aae..000000000000
--- a/emulators/gxemul/files/patch-aa
+++ /dev/null
@@ -1,32 +0,0 @@
---- src/devices/dev_wdc.cc.orig	2013-06-27 18:10:50.000000000 -0700
-+++ src/devices/dev_wdc.cc	2013-06-27 18:11:13.000000000 -0700
-@@ -274,12 +274,12 @@
- 	    + (int64_t)d->head * d->sectors_per_track[d->drive] +
- 	    (int64_t)d->heads[d->drive] * d->sectors_per_track[d->drive] * cyl);
- 
--#if 0
-+#if 1
- 	/*  LBA:  */
- 	if (d->lba)
- 		offset = 512 * (((d->head & 0xf) << 24) + (cyl << 8)
- 		    + d->sector);
--	printf("WDC read from offset %lli\n", (long long)offset);
-+	debug("WDC read from offset %lli\n", (long long)offset);
- #endif
- 
- 	while (count > 0) {
-@@ -320,12 +320,12 @@
- 	uint64_t offset = 512 * (d->sector - 1
- 	    + (int64_t)d->head * d->sectors_per_track[d->drive] +
- 	    (int64_t)d->heads[d->drive] * d->sectors_per_track[d->drive] * cyl);
--#if 0
-+#if 1
- 	/*  LBA:  */
- 	if (d->lba)
- 		offset = 512 * (((d->head & 0xf) << 24) +
- 		    (cyl << 8) + d->sector);
--	printf("WDC write to offset %lli\n", (long long)offset);
-+	debug("WDC write to offset %lli\n", (long long)offset);
- #endif
- 
- 	d->write_in_progress = d->cur_command;
diff --git a/emulators/gxemul/files/patch-ab b/emulators/gxemul/files/patch-ab
deleted file mode 100644
index aa155710ce96..000000000000
--- a/emulators/gxemul/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/include/refcount_ptr.h	2010-02-14 02:33:54.000000000 -0700
-+++ src/include/refcount_ptr.h	2014-02-24 03:48:14.000000000 -0700
-@@ -28,6 +28,8 @@
-  *  SUCH DAMAGE.
-  */
- 
-+#include <stddef.h>
-+
- /**
-  * \brief Base class for reference countable objects.
-  *
diff --git a/emulators/gxemul/files/patch-src_devices_dev_wdc.cc b/emulators/gxemul/files/patch-src_devices_dev_wdc.cc
new file mode 100644
index 000000000000..752e7f318aae
--- /dev/null
+++ b/emulators/gxemul/files/patch-src_devices_dev_wdc.cc
@@ -0,0 +1,32 @@
+--- src/devices/dev_wdc.cc.orig	2013-06-27 18:10:50.000000000 -0700
++++ src/devices/dev_wdc.cc	2013-06-27 18:11:13.000000000 -0700
+@@ -274,12 +274,12 @@
+ 	    + (int64_t)d->head * d->sectors_per_track[d->drive] +
+ 	    (int64_t)d->heads[d->drive] * d->sectors_per_track[d->drive] * cyl);
+ 
+-#if 0
++#if 1
+ 	/*  LBA:  */
+ 	if (d->lba)
+ 		offset = 512 * (((d->head & 0xf) << 24) + (cyl << 8)
+ 		    + d->sector);
+-	printf("WDC read from offset %lli\n", (long long)offset);
++	debug("WDC read from offset %lli\n", (long long)offset);
+ #endif
+ 
+ 	while (count > 0) {
+@@ -320,12 +320,12 @@
+ 	uint64_t offset = 512 * (d->sector - 1
+ 	    + (int64_t)d->head * d->sectors_per_track[d->drive] +
+ 	    (int64_t)d->heads[d->drive] * d->sectors_per_track[d->drive] * cyl);
+-#if 0
++#if 1
+ 	/*  LBA:  */
+ 	if (d->lba)
+ 		offset = 512 * (((d->head & 0xf) << 24) +
+ 		    (cyl << 8) + d->sector);
+-	printf("WDC write to offset %lli\n", (long long)offset);
++	debug("WDC write to offset %lli\n", (long long)offset);
+ #endif
+ 
+ 	d->write_in_progress = d->cur_command;
diff --git a/emulators/gxemul/files/patch-src_include_refcount_ptr.h b/emulators/gxemul/files/patch-src_include_refcount_ptr.h
new file mode 100644
index 000000000000..aa155710ce96
--- /dev/null
+++ b/emulators/gxemul/files/patch-src_include_refcount_ptr.h
@@ -0,0 +1,11 @@
+--- src/include/refcount_ptr.h	2010-02-14 02:33:54.000000000 -0700
++++ src/include/refcount_ptr.h	2014-02-24 03:48:14.000000000 -0700
+@@ -28,6 +28,8 @@
+  *  SUCH DAMAGE.
+  */
+ 
++#include <stddef.h>
++
+ /**
+  * \brief Base class for reference countable objects.
+  *
-- 
cgit v1.2.3