Merge branch 'avrdudes:main' into arduino_packing_release_test

mcuee · Feb 17, 2024 · 6b5c186 · 6b5c186
2 parents bddb1d6 + 5c1649d
commit 6b5c186
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 14 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -257,10 +257,8 @@ jobs:
     strategy:
       matrix:
         include:
-          - { sys: mingw32, env: i686 }
           - { sys: mingw64, env: x86_64 }
           - { sys: ucrt64, env: ucrt-x86_64 }
-          - { sys: clang32, env: clang-i686 }
           - { sys: clang64, env: clang-x86_64 }
     steps:
       - uses: actions/checkout@v3

diff --git a/NEWS b/NEWS
@@ -16,6 +16,9 @@ Changes since version 7.3:
   * Issues fixed:
 
   * Pull requests:
+     - Remove 32bit MSYS2 mingw32 and clang32 build #1687
+     - Make avrintel.h an internal header file for libavrdude #1686
+     - Fix -Wcalloc-transposed-args warning #1680
 
   * Internals:
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -156,7 +156,7 @@ add_library(libavrdude
     avrftdi_tpi.c
     avrftdi_tpi.h
     avrintel.c
-    avrintel.h
+    libavrdude-avrintel.h
     avrpart.c
     bitbang.c
     bitbang.h

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -103,7 +103,7 @@ libavrdude_a_SOURCES = \
 	avrftdi_tpi.c \
 	avrftdi_tpi.h \
 	avrintel.c \
-	avrintel.h \
+	libavrdude-avrintel.h \
 	avrpart.c \
 	bitbang.c \
 	bitbang.h \

diff --git a/src/avrftdi.c b/src/avrftdi.c
@@ -1271,7 +1271,7 @@ avrftdi_setup(PROGRAMMER * pgm)
 	avrftdi_t* pdata;
 
 
-	if(!(pgm->cookie = calloc(sizeof(avrftdi_t), 1))) {
+	if(!(pgm->cookie = calloc(1, sizeof(avrftdi_t)))) {
 		log_err("Error allocating memory.\n");
 		exit(1);
 	}

diff --git a/src/avrintel.c b/src/avrintel.c
@@ -9,7 +9,7 @@
  * Meta-author Stefan Rueger <[email protected]>
  *
  * v 1.3
- * 22.12.2023
+ * 14.02.2024
  *
  */
 
@@ -24,7 +24,7 @@
 #include <limits.h>
 #include <unistd.h>
 
-#include "avrintel.h"
+#include "libavrdude.h"
 
 // Given the MCU id return index in uP_table or -1 if not found
 int upidxmcuid(int mcuid) {

diff --git a/src/avrintel.h → src/libavrdude-avrintel.h b/src/avrintel.h → src/libavrdude-avrintel.h
@@ -1,20 +1,24 @@
 /*
  * Do not edit: automatically generated by mkavrintel.pl
  *
- * avrintel.h
+ * libavrdude-avrintel.h
  *
  * Microchip AVR8L, AVR8, XMEGA and AVR8X family description of interrupts, configurations and more
  *
  * Published under GNU General Public License, version 3 (GPL-3.0)
  * Meta-author Stefan Rueger <[email protected]>
  *
  * v 1.3
- * 22.12.2023
+ * 14.02.2024
  *
  */
 
-#ifndef avrintel_h
-#define avrintel_h
+#ifndef libavrdude_avrintel_h
+#define libavrdude_avrintel_h
+
+#ifndef LIBAVRDUDE_INCLUDE_INTERNAL_HEADERS
+#error Do not directly #include <libavrdude-avrintel.h>. Do #include <libavrdude.h> instead.
+#endif
 
 typedef struct {
   int value;                    // Value (to be shifted into mask position)

diff --git a/src/libavrdude.h b/src/libavrdude.h
@@ -25,7 +25,9 @@
 #include <limits.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include "avrintel.h"
+#define LIBAVRDUDE_INCLUDE_INTERNAL_HEADERS
+#include "libavrdude-avrintel.h"
+#undef  LIBAVRDUDE_INCLUDE_INTERNAL_HEADERS
 
 typedef uint32_t pinmask_t;
 /*

diff --git a/src/urclock_private.h b/src/urclock_private.h
@@ -21,8 +21,6 @@
 #ifndef urclock_private_h__
 #define urclock_private_h__
 
-#include "avrintel.h"
-
 // EEPROM or flash cache for bytewise access
 typedef struct {
   int base, size;