[tdeedu][master,r14.0.x] 9533c04b,bfa8c9db,73148be8,7b8a190b,9fb4e1cc,50406ced,aa80ed54,5c1789e2...

kstars/kstars/indi/apogee/CameraIO_Linux.cpp

diff --git a/kstars/kstars/indi/apogee/CameraIO_Linux.cpp b/kstars/kstars/indi/apogee/CameraIO_Linux.cpp

index 45c16e1..67d217e 100644

--- a/kstars/kstars/indi/apogee/CameraIO_Linux.cpp

+++ b/kstars/kstars/indi/apogee/CameraIO_Linux.cpp

@@ -88,7 +88,7 @@

 	m_FastShutterBits_Mode = 0;

 	m_FastShutterBits_Test = 0;

-        m_IRTQMask = 0;

+        m_IRQMask = 0;

         saveIRQS = 0;

kstars/kstars/indi/apogee/CameraIO_Linux.h

diff --git a/kstars/kstars/indi/apogee/CameraIO_Linux.h b/kstars/kstars/indi/apogee/CameraIO_Linux.h

index 47b08f4..cd2f07f 100644

--- a/kstars/kstars/indi/apogee/CameraIO_Linux.h

+++ b/kstars/kstars/indi/apogee/CameraIO_Linux.h

@@ -357,7 +357,7 @@

 										// 1 or CMOS: Complementary Metal-Oxide-Silicon

 	Camera_CoolerStatus m_CoolerStatus;		// Last known cooler status.

-	unsigned int m_IRTQMask;     	// Set of IRQs masked on user request										// 0: Off

+	unsigned int m_IRQMask;     	// Set of IRQs masked on user request										// 0: Off

 											// 1: Ramping to set point

 											// 2: Correcting

 											// 3: Ramping to ambient

kstars/kstars/indi/webcam/port.cpp

diff --git a/kstars/kstars/indi/webcam/port.cpp b/kstars/kstars/indi/webcam/port.cpp

index 793f095..d5b68d4 100644

--- a/kstars/kstars/indi/webcam/port.cpp

+++ b/kstars/kstars/indi/webcam/port.cpp

@@ -20,9 +20,9 @@

 // I/O ports wrapper code

 // This file might need tweaking if you're trying to port my code to other

 // x86 Unix platforms.  Code is already available for Linux, FreeBSD, and

-// TQNX; see the Makefile.

+// QNX; see the Makefile.

//

-// TQNX code by: Anders Arpteg <aa11ac@...>

+// QNX code by: Anders Arpteg <aa11ac@...>

 // FreeBSD code by: Patrick Reynolds <reynolds@...> and Charles

 //                  Henrich <henrich@...>

@@ -43,7 +43,7 @@

   #else

   #include <sys/io.h>

   #endif /* arm */

-#elif defined(TQNX)

+#elif defined(QNX)

 #include <conio.h>

 #elif defined(__FreeBSD__)

 #include <sys/types.h>

kstars/kstars/indi/webcam/port.h

diff --git a/kstars/kstars/indi/webcam/port.h b/kstars/kstars/indi/webcam/port.h

index 4009ec2..70dd9d4 100644

--- a/kstars/kstars/indi/webcam/port.h

+++ b/kstars/kstars/indi/webcam/port.h

@@ -20,9 +20,9 @@

 // I/O ports wrapper definitions and prototypes

 // This file might need tweaking if you're trying to port my code to other

 // x86 Unix platforms.  Code is already available for Linux, FreeBSD, and

-// TQNX; see the Makefile.

+// QNX; see the Makefile.

//

-// TQNX code by: Anders Arpteg <aa11ac@...>

+// QNX code by: Anders Arpteg <aa11ac@...>

 // FreeBSD code by: Patrick Reynolds <reynolds@...> and Charles

 //                  Henrich <henrich@...>

 // Inlining implemented by: Philip Blundell <philip.blundell@...>

@@ -38,7 +38,7 @@

   #if !defined(arm) && !defined(__aarch64__) && !defined(__hppa__) && !defined(__sparc__) && !defined(__ppc__) && !defined(__powerpc__) && !defined(__s390__) && !defined(__s390x__) && !defined(__mips__) && !defined(__mc68000__)

   #include <sys/io.h>

   #endif /* !arm */

-#elif defined(TQNX)

+#elif defined(QNX)

 #include <conio.h>

 #elif defined(__FreeBSD__)

 #include <machine/cpufunc.h>

@@ -90,7 +90,7 @@

   inline void write_control(int data) { outb(control_reg = data, port2); }

   inline void setbit_control(int data) { outb(control_reg |= data, port2); }

   inline void clearbit_control(int data) { outb(control_reg &= ~data, port2); }

-#else // Solaris, TQNX, and *BSD use (port, data) instead

+#else // Solaris, QNX, and *BSD use (port, data) instead

   inline void write_data(int data) { outb(port, data); }

   inline void write_control(int data) { outb(port2, control_reg = data); }

   inline void setbit_control(int data) { outb(port2, control_reg |= data); }

kstars/kstars/indi/webcam/v4l2_base.cpp

diff --git a/kstars/kstars/indi/webcam/v4l2_base.cpp b/kstars/kstars/indi/webcam/v4l2_base.cpp

index ffb168e..26ec3d5 100644

--- a/kstars/kstars/indi/webcam/v4l2_base.cpp

+++ b/kstars/kstars/indi/webcam/v4l2_base.cpp

@@ -168,7 +168,7 @@

             	buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;

             	buf.memory = V4L2_MEMORY_MMAP;

-    		if (-1 == xioctl (fd, VIDIOC_DTQBUF, &buf)) {

+    		if (-1 == xioctl (fd, VIDIOC_DQBUF, &buf)) {

             		switch (errno) {

             		case EAGAIN:

                     		return 0;

@@ -179,7 +179,7 @@

 				/* fall through */

 			default:

-				return errno_exit ("VIDIOC_DTQBUF", errmsg);

+				return errno_exit ("VIDIOC_DQBUF", errmsg);

@@ -206,8 +206,8 @@

                          break;

-		if (-1 == xioctl (fd, VIDIOC_TQBUF, &buf))

-			return errno_exit ("VIDIOC_TQBUF", errmsg);

+		if (-1 == xioctl (fd, VIDIOC_QBUF, &buf))

+			return errno_exit ("VIDIOC_QBUF", errmsg);

                 if (dropFrame)

@@ -227,7 +227,7 @@

     		buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;

     		buf.memory = V4L2_MEMORY_USERPTR;

-		if (-1 == xioctl (fd, VIDIOC_DTQBUF, &buf)) {

+		if (-1 == xioctl (fd, VIDIOC_DQBUF, &buf)) {

 			switch (errno) {

 			case EAGAIN:

 				return 0;

@@ -238,7 +238,7 @@

 				/* fall through */

 			default:

-				errno_exit ("VIDIOC_DTQBUF", errmsg);

+				errno_exit ("VIDIOC_DQBUF", errmsg);

@@ -251,8 +251,8 @@

     		//process_image ((void *) buf.m.userptr);

-		if (-1 == xioctl (fd, VIDIOC_TQBUF, &buf))

-			errno_exit ("VIDIOC_TQBUF", errmsg);

+		if (-1 == xioctl (fd, VIDIOC_QBUF, &buf))

+			errno_exit ("VIDIOC_QBUF", errmsg);

 		break;

@@ -309,8 +309,8 @@

         		buf.memory      = V4L2_MEMORY_MMAP;

         		buf.index       = i;

-        		if (-1 == xioctl (fd, VIDIOC_TQBUF, &buf))

-                    		return errno_exit ("VIDIOC_TQBUF", errmsg);

+        		if (-1 == xioctl (fd, VIDIOC_QBUF, &buf))

+                    		return errno_exit ("VIDIOC_QBUF", errmsg);

@@ -336,8 +336,8 @@

         		buf.m.userptr	= (unsigned long) buffers[i].start;

 			buf.length      = buffers[i].length;

-        		if (-1 == xioctl (fd, VIDIOC_TQBUF, &buf))

-                    		return errno_exit ("VIDIOC_TQBUF", errmsg);

+        		if (-1 == xioctl (fd, VIDIOC_QBUF, &buf))

+                    		return errno_exit ("VIDIOC_QBUF", errmsg);

kstars/kstars/indi/webcam/videodev.h

diff --git a/kstars/kstars/indi/webcam/videodev.h b/kstars/kstars/indi/webcam/videodev.h

index a792905..a5b0aec 100644

--- a/kstars/kstars/indi/webcam/videodev.h

+++ b/kstars/kstars/indi/webcam/videodev.h

@@ -302,9 +302,9 @@

 #define VID_HARDWARE_BT848	1

-#define VID_HARDWARE_TQCAM_BW	2

+#define VID_HARDWARE_QCAM_BW	2

 #define VID_HARDWARE_PMS	3

-#define VID_HARDWARE_TQCAM_C	4

+#define VID_HARDWARE_QCAM_C	4

 #define VID_HARDWARE_PSEUDO	5

 #define VID_HARDWARE_SAA5249	6

 #define VID_HARDWARE_AZTECH	7

kstars/kstars/indi/webcam/videodev2.h

diff --git a/kstars/kstars/indi/webcam/videodev2.h b/kstars/kstars/indi/webcam/videodev2.h

index a82697b..e3dab3a 100644

--- a/kstars/kstars/indi/webcam/videodev2.h

+++ b/kstars/kstars/indi/webcam/videodev2.h

@@ -843,8 +843,8 @@

 #define VIDIOC_G_FBUF		_IOR  ('V', 10, struct v4l2_framebuffer)

 #define VIDIOC_S_FBUF		_IOW  ('V', 11, struct v4l2_framebuffer)

 #define VIDIOC_OVERLAY		_IOW  ('V', 14, int)

-#define VIDIOC_TQBUF		_IOWR ('V', 15, struct v4l2_buffer)

-#define VIDIOC_DTQBUF		_IOWR ('V', 17, struct v4l2_buffer)

+#define VIDIOC_QBUF		_IOWR ('V', 15, struct v4l2_buffer)

+#define VIDIOC_DQBUF		_IOWR ('V', 17, struct v4l2_buffer)

 #define VIDIOC_STREAMON		_IOW  ('V', 18, int)

 #define VIDIOC_STREAMOFF	_IOW  ('V', 19, int)

 #define VIDIOC_G_PARM		_IOWR ('V', 21, struct v4l2_streamparm)

9533c04b	2019-06-22 22:36:13	Slávek Banko
Fixed unintentional renaming QT => TQT. Signed-off-by: Slávek Banko <slavek.banko@...>
M kstars/kstars/indi/apogee/CameraIO_Linux.cpp M kstars/kstars/indi/apogee/CameraIO_Linux.h M kstars/kstars/indi/webcam/port.cpp M kstars/kstars/indi/webcam/port.h M kstars/kstars/indi/webcam/v4l2_base.cpp M kstars/kstars/indi/webcam/videodev.h M kstars/kstars/indi/webcam/videodev2.h
kstars/kstars/indi/apogee/CameraIO_Linux.cpp diff --git a/kstars/kstars/indi/apogee/CameraIO_Linux.cpp b/kstars/kstars/indi/apogee/CameraIO_Linux.cpp index 45c16e1..67d217e 100644 --- a/kstars/kstars/indi/apogee/CameraIO_Linux.cpp +++ b/kstars/kstars/indi/apogee/CameraIO_Linux.cpp @@ -88,7 +88,7 @@ m_FastShutterBits_Mode = 0; m_FastShutterBits_Test = 0; - m_IRTQMask = 0; + m_IRQMask = 0; saveIRQS = 0; } kstars/kstars/indi/apogee/CameraIO_Linux.h diff --git a/kstars/kstars/indi/apogee/CameraIO_Linux.h b/kstars/kstars/indi/apogee/CameraIO_Linux.h index 47b08f4..cd2f07f 100644 --- a/kstars/kstars/indi/apogee/CameraIO_Linux.h +++ b/kstars/kstars/indi/apogee/CameraIO_Linux.h @@ -357,7 +357,7 @@ // 1 or CMOS: Complementary Metal-Oxide-Silicon Camera_CoolerStatus m_CoolerStatus; // Last known cooler status. - unsigned int m_IRTQMask; // Set of IRQs masked on user request // 0: Off + unsigned int m_IRQMask; // Set of IRQs masked on user request // 0: Off // 1: Ramping to set point // 2: Correcting // 3: Ramping to ambient kstars/kstars/indi/webcam/port.cpp diff --git a/kstars/kstars/indi/webcam/port.cpp b/kstars/kstars/indi/webcam/port.cpp index 793f095..d5b68d4 100644 --- a/kstars/kstars/indi/webcam/port.cpp +++ b/kstars/kstars/indi/webcam/port.cpp @@ -20,9 +20,9 @@ // I/O ports wrapper code // This file might need tweaking if you're trying to port my code to other // x86 Unix platforms. Code is already available for Linux, FreeBSD, and -// TQNX; see the Makefile. +// QNX; see the Makefile. // -// TQNX code by: Anders Arpteg <aa11ac@...> +// QNX code by: Anders Arpteg <aa11ac@...> // FreeBSD code by: Patrick Reynolds <reynolds@...> and Charles // Henrich <henrich@...> @@ -43,7 +43,7 @@ #else #include <sys/io.h> #endif /* arm / -#elif defined(TQNX) +#elif defined(QNX) #include <conio.h> #elif defined(__FreeBSD__) #include <sys/types.h> kstars/kstars/indi/webcam/port.h diff --git a/kstars/kstars/indi/webcam/port.h b/kstars/kstars/indi/webcam/port.h index 4009ec2..70dd9d4 100644 --- a/kstars/kstars/indi/webcam/port.h +++ b/kstars/kstars/indi/webcam/port.h @@ -20,9 +20,9 @@ // I/O ports wrapper definitions and prototypes // This file might need tweaking if you're trying to port my code to other // x86 Unix platforms. Code is already available for Linux, FreeBSD, and -// TQNX; see the Makefile. +// QNX; see the Makefile. // -// TQNX code by: Anders Arpteg <aa11ac@...> +// QNX code by: Anders Arpteg <aa11ac@...> // FreeBSD code by: Patrick Reynolds <reynolds@...> and Charles // Henrich <henrich@...> // Inlining implemented by: Philip Blundell <philip.blundell@...> @@ -38,7 +38,7 @@ #if !defined(arm) && !defined(__aarch64__) && !defined(__hppa__) && !defined(__sparc__) && !defined(__ppc__) && !defined(__powerpc__) && !defined(__s390__) && !defined(__s390x__) && !defined(__mips__) && !defined(__mc68000__) #include <sys/io.h> #endif / !arm / -#elif defined(TQNX) +#elif defined(QNX) #include <conio.h> #elif defined(__FreeBSD__) #include <machine/cpufunc.h> @@ -90,7 +90,7 @@ inline void write_control(int data) { outb(control_reg = data, port2); } inline void setbit_control(int data) { outb(control_reg \|= data, port2); } inline void clearbit_control(int data) { outb(control_reg &= ~data, port2); } -#else // Solaris, TQNX, and BSD use (port, data) instead +#else // Solaris, QNX, and BSD use (port, data) instead inline void write_data(int data) { outb(port, data); } inline void write_control(int data) { outb(port2, control_reg = data); } inline void setbit_control(int data) { outb(port2, control_reg \|= data); } kstars/kstars/indi/webcam/v4l2_base.cpp diff --git a/kstars/kstars/indi/webcam/v4l2_base.cpp b/kstars/kstars/indi/webcam/v4l2_base.cpp index ffb168e..26ec3d5 100644 --- a/kstars/kstars/indi/webcam/v4l2_base.cpp +++ b/kstars/kstars/indi/webcam/v4l2_base.cpp @@ -168,7 +168,7 @@ buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; buf.memory = V4L2_MEMORY_MMAP; - if (-1 == xioctl (fd, VIDIOC_DTQBUF, &buf)) { + if (-1 == xioctl (fd, VIDIOC_DQBUF, &buf)) { switch (errno) { case EAGAIN: return 0; @@ -179,7 +179,7 @@ / fall through / default: - return errno_exit ("VIDIOC_DTQBUF", errmsg); + return errno_exit ("VIDIOC_DQBUF", errmsg); } } @@ -206,8 +206,8 @@ break; } - if (-1 == xioctl (fd, VIDIOC_TQBUF, &buf)) - return errno_exit ("VIDIOC_TQBUF", errmsg); + if (-1 == xioctl (fd, VIDIOC_QBUF, &buf)) + return errno_exit ("VIDIOC_QBUF", errmsg); if (dropFrame) { @@ -227,7 +227,7 @@ buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; buf.memory = V4L2_MEMORY_USERPTR; - if (-1 == xioctl (fd, VIDIOC_DTQBUF, &buf)) { + if (-1 == xioctl (fd, VIDIOC_DQBUF, &buf)) { switch (errno) { case EAGAIN: return 0; @@ -238,7 +238,7 @@ / fall through / default: - errno_exit ("VIDIOC_DTQBUF", errmsg); + errno_exit ("VIDIOC_DQBUF", errmsg); } } @@ -251,8 +251,8 @@ //process_image ((void ) buf.m.userptr); - if (-1 == xioctl (fd, VIDIOC_TQBUF, &buf)) - errno_exit ("VIDIOC_TQBUF", errmsg); + if (-1 == xioctl (fd, VIDIOC_QBUF, &buf)) + errno_exit ("VIDIOC_QBUF", errmsg); break; } @@ -309,8 +309,8 @@ buf.memory = V4L2_MEMORY_MMAP; buf.index = i; - if (-1 == xioctl (fd, VIDIOC_TQBUF, &buf)) - return errno_exit ("VIDIOC_TQBUF", errmsg); + if (-1 == xioctl (fd, VIDIOC_QBUF, &buf)) + return errno_exit ("VIDIOC_QBUF", errmsg); } @@ -336,8 +336,8 @@ buf.m.userptr = (unsigned long) buffers[i].start; buf.length = buffers[i].length; - if (-1 == xioctl (fd, VIDIOC_TQBUF, &buf)) - return errno_exit ("VIDIOC_TQBUF", errmsg); + if (-1 == xioctl (fd, VIDIOC_QBUF, &buf)) + return errno_exit ("VIDIOC_QBUF", errmsg); } kstars/kstars/indi/webcam/videodev.h diff --git a/kstars/kstars/indi/webcam/videodev.h b/kstars/kstars/indi/webcam/videodev.h index a792905..a5b0aec 100644 --- a/kstars/kstars/indi/webcam/videodev.h +++ b/kstars/kstars/indi/webcam/videodev.h @@ -302,9 +302,9 @@ #define VID_HARDWARE_BT848 1 -#define VID_HARDWARE_TQCAM_BW 2 +#define VID_HARDWARE_QCAM_BW 2 #define VID_HARDWARE_PMS 3 -#define VID_HARDWARE_TQCAM_C 4 +#define VID_HARDWARE_QCAM_C 4 #define VID_HARDWARE_PSEUDO 5 #define VID_HARDWARE_SAA5249 6 #define VID_HARDWARE_AZTECH 7 kstars/kstars/indi/webcam/videodev2.h diff --git a/kstars/kstars/indi/webcam/videodev2.h b/kstars/kstars/indi/webcam/videodev2.h index a82697b..e3dab3a 100644 --- a/kstars/kstars/indi/webcam/videodev2.h +++ b/kstars/kstars/indi/webcam/videodev2.h @@ -843,8 +843,8 @@ #define VIDIOC_G_FBUF _IOR ('V', 10, struct v4l2_framebuffer) #define VIDIOC_S_FBUF _IOW ('V', 11, struct v4l2_framebuffer) #define VIDIOC_OVERLAY _IOW ('V', 14, int) -#define VIDIOC_TQBUF _IOWR ('V', 15, struct v4l2_buffer) -#define VIDIOC_DTQBUF _IOWR ('V', 17, struct v4l2_buffer) +#define VIDIOC_QBUF _IOWR ('V', 15, struct v4l2_buffer) +#define VIDIOC_DQBUF _IOWR ('V', 17, struct v4l2_buffer) #define VIDIOC_STREAMON _IOW ('V', 18, int) #define VIDIOC_STREAMOFF _IOW ('V', 19, int) #define VIDIOC_G_PARM _IOWR ('V', 21, struct v4l2_streamparm)
bfa8c9db	2019-06-22 22:43:20	Slávek Banko
Remove unnecessary malloc include, because it causes FTBFS on some systems. Signed-off-by: Slávek Banko <slavek.banko@...>
M kstars/kstars/indi/apogee/ApnCamData.cpp M kstars/kstars/indi/apogee/ApnCamData_CCD3011HS.cpp M kstars/kstars/indi/apogee/ApnCamData_CCD3011LS.cpp M kstars/kstars/indi/apogee/ApnCamData_CCD4240HS.cpp M kstars/kstars/indi/apogee/ApnCamData_CCD4240LS.cpp M kstars/kstars/indi/apogee/ApnCamData_CCD4710HS.cpp M kstars/kstars/indi/apogee/ApnCamData_CCD4710LS.cpp M kstars/kstars/indi/apogee/ApnCamData_CCD4710LS2.cpp M kstars/kstars/indi/apogee/ApnCamData_CCD4710LS3.cpp M kstars/kstars/indi/apogee/ApnCamData_CCD4710LS4.cpp M kstars/kstars/indi/apogee/ApnCamData_CCD4710LS5.cpp M kstars/kstars/indi/apogee/ApnCamData_CCD4720HS.cpp M kstars/kstars/indi/apogee/ApnCamData_CCD4720LS.cpp M kstars/kstars/indi/apogee/ApnCamData_CCD5520HS.cpp M kstars/kstars/indi/apogee/ApnCamData_CCD5520LS.cpp M kstars/kstars/indi/apogee/ApnCamData_CCD5710HS.cpp M kstars/kstars/indi/apogee/ApnCamData_CCD5710LS.cpp M kstars/kstars/indi/apogee/ApnCamData_CCD7700HS.cpp M kstars/kstars/indi/apogee/ApnCamData_CCD7700LS.cpp M kstars/kstars/indi/apogee/ApnCamData_KAF0261E.cpp M kstars/kstars/indi/apogee/ApnCamData_KAF0401E.cpp M kstars/kstars/indi/apogee/ApnCamData_KAF1001E.cpp M kstars/kstars/indi/apogee/ApnCamData_KAF1301E.cpp M kstars/kstars/indi/apogee/ApnCamData_KAF1401E.cpp M kstars/kstars/indi/apogee/ApnCamData_KAF1602E.cpp M kstars/kstars/indi/apogee/ApnCamData_KAF16801E.cpp M kstars/kstars/indi/apogee/ApnCamData_KAF3200E.cpp M kstars/kstars/indi/apogee/ApnCamData_KAF4202.cpp M kstars/kstars/indi/apogee/ApnCamData_KAF6303E.cpp M kstars/kstars/indi/apogee/ApnCamData_TH7899.cpp
kstars/kstars/indi/apogee/ApnCamData.cpp diff --git a/kstars/kstars/indi/apogee/ApnCamData.cpp b/kstars/kstars/indi/apogee/ApnCamData.cpp index da33974..9a6bc5a 100644 --- a/kstars/kstars/indi/apogee/ApnCamData.cpp +++ b/kstars/kstars/indi/apogee/ApnCamData.cpp @@ -7,7 +7,6 @@ #include "ApnCamData.h" #include <stdlib.h> -#include <malloc.h> ////////////////////////////////////////////////////////////////////// kstars/kstars/indi/apogee/ApnCamData_CCD3011HS.cpp diff --git a/kstars/kstars/indi/apogee/ApnCamData_CCD3011HS.cpp b/kstars/kstars/indi/apogee/ApnCamData_CCD3011HS.cpp index 8ea6b7d..78ff3bf 100644 --- a/kstars/kstars/indi/apogee/ApnCamData_CCD3011HS.cpp +++ b/kstars/kstars/indi/apogee/ApnCamData_CCD3011HS.cpp @@ -17,7 +17,6 @@ #include "ApnCamData_CCD3011HS.h" #include <stdlib.h> -#include <malloc.h> #include <string.h> kstars/kstars/indi/apogee/ApnCamData_CCD3011LS.cpp diff --git a/kstars/kstars/indi/apogee/ApnCamData_CCD3011LS.cpp b/kstars/kstars/indi/apogee/ApnCamData_CCD3011LS.cpp index 565c3f8..f7150d2 100644 --- a/kstars/kstars/indi/apogee/ApnCamData_CCD3011LS.cpp +++ b/kstars/kstars/indi/apogee/ApnCamData_CCD3011LS.cpp @@ -7,7 +7,6 @@ #include "ApnCamData_CCD3011LS.h" #include <stdlib.h> -#include <malloc.h> #include <string.h> kstars/kstars/indi/apogee/ApnCamData_CCD4240HS.cpp diff --git a/kstars/kstars/indi/apogee/ApnCamData_CCD4240HS.cpp b/kstars/kstars/indi/apogee/ApnCamData_CCD4240HS.cpp index cfb84f1..9462885 100644 --- a/kstars/kstars/indi/apogee/ApnCamData_CCD4240HS.cpp +++ b/kstars/kstars/indi/apogee/ApnCamData_CCD4240HS.cpp @@ -7,7 +7,6 @@ #include "ApnCamData_CCD4240HS.h" #include <stdlib.h> -#include <malloc.h> #include <string.h> kstars/kstars/indi/apogee/ApnCamData_CCD4240LS.cpp diff --git a/kstars/kstars/indi/apogee/ApnCamData_CCD4240LS.cpp b/kstars/kstars/indi/apogee/ApnCamData_CCD4240LS.cpp index d768dad..7d07d3e 100644 Diff limit reached (max: 250 lines)
73148be8	2019-06-22 22:46:50	Slávek Banko
Add definitions for FreeBSD in kstars/indi/apogee. Signed-off-by: Slávek Banko <slavek.banko@...>
M kstars/kstars/indi/apogee/stdafx.h
Diff limit reached (max: 250 lines)
7b8a190b	2019-06-22 23:32:08	Slávek Banko
Fix "videodev.h" incorrect detection as header for V4L2. This header is valid for V4L1. Signed-off-by: Slávek Banko <slavek.banko@...>
M kstars/configure.in.in M kstars/kstars/indi/webcam/v4l1_base.h M kstars/kstars/indi/webcam/v4l1_pwc.h
Diff limit reached (max: 250 lines)
9fb4e1cc	2019-06-22 23:56:28	Slávek Banko
Use kernel V2L includes instead of old local copies. Signed-off-by: Slávek Banko <slavek.banko@...>
M kstars/kstars/indi/v4ldriver.h M kstars/kstars/indi/webcam/v4l1_base.h M kstars/kstars/indi/webcam/v4l1_pwc.h M kstars/kstars/indi/webcam/v4l2_base.cpp M kstars/kstars/indi/webcam/v4l2_base.h R kstars/kstars/indi/webcam/videodev.h R kstars/kstars/indi/webcam/videodev2.h
Diff limit reached (max: 250 lines)

aa80ed54	2019-06-22 22:43:29	Slávek Banko
Remove unnecessary malloc include, because it causes FTBFS on some systems. Signed-off-by: Slávek Banko <slavek.banko@...> (cherry picked from commit bfa8c9db8f50dbcf27a0fd955c322e1ed2bad72d)
M kstars/kstars/indi/apogee/ApnCamData.cpp M kstars/kstars/indi/apogee/ApnCamData_CCD3011HS.cpp M kstars/kstars/indi/apogee/ApnCamData_CCD3011LS.cpp M kstars/kstars/indi/apogee/ApnCamData_CCD4240HS.cpp M kstars/kstars/indi/apogee/ApnCamData_CCD4240LS.cpp M kstars/kstars/indi/apogee/ApnCamData_CCD4710HS.cpp M kstars/kstars/indi/apogee/ApnCamData_CCD4710LS.cpp M kstars/kstars/indi/apogee/ApnCamData_CCD4710LS2.cpp M kstars/kstars/indi/apogee/ApnCamData_CCD4710LS3.cpp M kstars/kstars/indi/apogee/ApnCamData_CCD4710LS4.cpp M kstars/kstars/indi/apogee/ApnCamData_CCD4710LS5.cpp M kstars/kstars/indi/apogee/ApnCamData_CCD4720HS.cpp M kstars/kstars/indi/apogee/ApnCamData_CCD4720LS.cpp M kstars/kstars/indi/apogee/ApnCamData_CCD5520HS.cpp M kstars/kstars/indi/apogee/ApnCamData_CCD5520LS.cpp M kstars/kstars/indi/apogee/ApnCamData_CCD5710HS.cpp M kstars/kstars/indi/apogee/ApnCamData_CCD5710LS.cpp M kstars/kstars/indi/apogee/ApnCamData_CCD7700HS.cpp M kstars/kstars/indi/apogee/ApnCamData_CCD7700LS.cpp M kstars/kstars/indi/apogee/ApnCamData_KAF0261E.cpp M kstars/kstars/indi/apogee/ApnCamData_KAF0401E.cpp M kstars/kstars/indi/apogee/ApnCamData_KAF1001E.cpp M kstars/kstars/indi/apogee/ApnCamData_KAF1301E.cpp M kstars/kstars/indi/apogee/ApnCamData_KAF1401E.cpp M kstars/kstars/indi/apogee/ApnCamData_KAF1602E.cpp M kstars/kstars/indi/apogee/ApnCamData_KAF16801E.cpp M kstars/kstars/indi/apogee/ApnCamData_KAF3200E.cpp M kstars/kstars/indi/apogee/ApnCamData_KAF4202.cpp M kstars/kstars/indi/apogee/ApnCamData_KAF6303E.cpp M kstars/kstars/indi/apogee/ApnCamData_TH7899.cpp
Diff limit reached (max: 250 lines)
5c1789e2	2019-06-22 22:46:59	Slávek Banko
Add definitions for FreeBSD in kstars/indi/apogee. Signed-off-by: Slávek Banko <slavek.banko@...> (cherry picked from commit 73148be818bbd9b8ee89a597467b89eab9f6b678)
M kstars/kstars/indi/apogee/stdafx.h
Diff limit reached (max: 250 lines)
869dcee5	2019-06-22 23:32:20	Slávek Banko
Fix "videodev.h" incorrect detection as header for V4L2. This header is valid for V4L1. Signed-off-by: Slávek Banko <slavek.banko@...> (cherry picked from commit 7b8a190b623dc48ab4fc0867f0a0fd5d8cc4c2b1)
M kstars/configure.in.in M kstars/kstars/indi/webcam/v4l1_base.h M kstars/kstars/indi/webcam/v4l1_pwc.h
Diff limit reached (max: 250 lines)
88af19c0	2019-06-22 23:56:42	Slávek Banko
Use kernel V2L includes instead of old local copies. Signed-off-by: Slávek Banko <slavek.banko@...> (cherry picked from commit 9fb4e1ccde0b89b413bfdc8ae62f8178ecad5483)
M kstars/kstars/indi/v4ldriver.h M kstars/kstars/indi/webcam/v4l1_base.h M kstars/kstars/indi/webcam/v4l1_pwc.h M kstars/kstars/indi/webcam/v4l2_base.cpp M kstars/kstars/indi/webcam/v4l2_base.h R kstars/kstars/indi/webcam/videodev.h R kstars/kstars/indi/webcam/videodev2.h
Diff limit reached (max: 250 lines)

Branch: master

kstars/kstars/indi/apogee/CameraIO_Linux.cpp

kstars/kstars/indi/apogee/CameraIO_Linux.h

kstars/kstars/indi/webcam/port.cpp

kstars/kstars/indi/webcam/port.h

kstars/kstars/indi/webcam/v4l2_base.cpp

kstars/kstars/indi/webcam/videodev.h

kstars/kstars/indi/webcam/videodev2.h

kstars/kstars/indi/apogee/ApnCamData.cpp

kstars/kstars/indi/apogee/ApnCamData_CCD3011HS.cpp

kstars/kstars/indi/apogee/ApnCamData_CCD3011LS.cpp

kstars/kstars/indi/apogee/ApnCamData_CCD4240HS.cpp

kstars/kstars/indi/apogee/ApnCamData_CCD4240LS.cpp

Branch: r14.0.x