Skip to content

Make avrintel.h an internal header file for libavrdude #1686

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 14, 2024
Merged

Make avrintel.h an internal header file for libavrdude #1686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions src/avrintel.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* Meta-author Stefan Rueger <[email protected]>
*
* v 1.3
* 22.12.2023
* 14.02.2024
*
*/

Expand All @@ -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) {
Expand Down
12 changes: 8 additions & 4 deletions src/avrintel.h → src/libavrdude-avrintel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
4 changes: 3 additions & 1 deletion src/libavrdude.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
/*
Expand Down
2 changes: 0 additions & 2 deletions src/urclock_private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down