summaryrefslogtreecommitdiff
path: root/devel/libgphoto2/patches/patch-ae
diff options
context:
space:
mode:
Diffstat (limited to 'devel/libgphoto2/patches/patch-ae')
-rw-r--r--devel/libgphoto2/patches/patch-ae49
1 files changed, 49 insertions, 0 deletions
diff --git a/devel/libgphoto2/patches/patch-ae b/devel/libgphoto2/patches/patch-ae
new file mode 100644
index 00000000000..e32963cd0c6
--- /dev/null
+++ b/devel/libgphoto2/patches/patch-ae
@@ -0,0 +1,49 @@
+$NetBSD: patch-ae,v 1.1 2007/02/05 20:03:19 markd Exp $
+
+--- camlibs/mars/mars.c.orig 2007-02-03 18:30:12.430858000 +1300
++++ camlibs/mars/mars.c
+@@ -38,7 +38,7 @@
+ #define GET_DATA 0x0f
+
+ static int
+-M_READ (GPPort *port, char *data, int size)
++Ma_READ (GPPort *port, char *data, int size)
+ {
+ gp_port_write(port, "\x21", 1);
+ gp_port_read(port, data, 16);
+@@ -49,7 +49,7 @@ static int
+ M_COMMAND (GPPort *port, char *command, int size, char *response)
+ {
+ gp_port_write(port, command, size);
+- M_READ(port, response, 16);
++ Ma_READ(port, response, 16);
+ return GP_OK;
+ }
+
+@@ -68,7 +68,7 @@ mars_init (Camera *camera, GPPort *port,
+ * camera reports 0x02 it is "jammed" and we must clear it.
+ */
+
+- M_READ(port, c, 16);
++ Ma_READ(port, c, 16);
+ if ( (c[0] == 0x02 ) ) {
+ gp_port_write(port, "\x19", 1);
+ gp_port_read(port, c, 16);
+@@ -317,7 +317,7 @@ mars_routine (Info *info, GPPort *port,
+ memset(c,0,sizeof(c));
+
+ /*Routine used in initialization, photo download, and reset. */
+- M_READ(port, c, 16);
++ Ma_READ(port, c, 16);
+ M_COMMAND(port, start, 2, c);
+ M_COMMAND(port, do_something, 2, c);
+ M_COMMAND(port, address1, 2, c);
+@@ -326,7 +326,7 @@ mars_routine (Info *info, GPPort *port,
+ gp_port_write(port, address2, 2);
+ /* Moving the memory cursor to the given address? */
+ while (( c[0] != 0xa) ) {
+- M_READ(port, c, 16);
++ Ma_READ(port, c, 16);
+ }
+
+ M_COMMAND(port, address3, 2, c);