Skip to content

Commit 8db7e88

Browse files
devangpateldevangpatel
authored
Merge branch 'viveris:master' into master
2 parents 2dca8b3 + 6748f1d commit 8db7e88

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+120
-121
lines changed

‎Release-notes.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Lightweight USB Media Transfer Protocol (MTP)
44
* responder
55
*
6-
* Copyright (c) 2018 - 2024 Viveris Technologies
6+
* Copyright (c) 2018 - 2025 Viveris Technologies
77
*
88
* https://github.com/viveris/uMTP-Responder
99
*

‎inc/default_cfg.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* uMTP Responder
3-
* Copyright (c) 2018 - 2024 Viveris Technologies
3+
* Copyright (c) 2018 - 2025 Viveris Technologies
44
*
55
* uMTP Responder is free software; you can redistribute it and/or
66
* modify it under the terms of the GNU General Public

‎inc/fs_handles_db.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* uMTP Responder
3-
* Copyright (c) 2018 - 2024 Viveris Technologies
3+
* Copyright (c) 2018 - 2025 Viveris Technologies
44
*
55
* uMTP Responder is free software; you can redistribute it and/or
66
* modify it under the terms of the GNU General Public

‎inc/logs_out.h

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* uMTP Responder
3-
* Copyright (c) 2018 - 2024 Viveris Technologies
3+
* Copyright (c) 2018 - 2025 Viveris Technologies
44
*
55
* uMTP Responder is free software; you can redistribute it and/or
66
* modify it under the terms of the GNU General Public
@@ -45,16 +45,16 @@ void timestamp(char * timestr, int maxsize);
4545

4646
#ifdef USE_SYSLOG // Syslog usage
4747

48-
#define PRINT_MSG(fmt, args...) syslog(LOG_NOTICE, "[uMTPrd - Info] " fmt "\n", \
49-
## args)
48+
#define PRINT_MSG(fmt, args...) syslog(LOG_NOTICE, "[uMTPrd - Info] " fmt "\n", \
49+
## args)
5050
#define PRINT_ERROR(fmt, args...) syslog(LOG_ERR, "[uMTPrd - Error] " fmt "\n", \
51-
## args)
51+
## args)
5252
#define PRINT_WARN(fmt, args...) syslog(LOG_WARNING, "[uMTPrd - Warning] " fmt "\n", \
53-
## args)
53+
## args)
5454
#ifdef DEBUG
5555

5656
#define PRINT_DEBUG(fmt, args...) syslog(LOG_DEBUG, "[uMTPrd - Debug] " fmt "\n", \
57-
## args)
57+
## args)
5858
#else
5959

6060
#define PRINT_DEBUG(fmt, args...)
@@ -63,42 +63,42 @@ void timestamp(char * timestr, int maxsize);
6363

6464
#else // Stdout usage
6565

66-
#define PRINT_MSG(fmt, args...) do { \
67-
char timestr[32]; \
68-
timestamp((char*)&timestr, sizeof(timestr)); \
69-
fprintf(stdout, \
70-
"[uMTPrd - %s - Info] " fmt "\n",(char*)&timestr, \
71-
## args); \
72-
fflush(stdout); \
73-
} while (0)
74-
75-
#define PRINT_ERROR(fmt, args...) do { \
76-
char timestr[32]; \
77-
timestamp((char*)&timestr, sizeof(timestr)); \
78-
fprintf(stderr, \
79-
"[uMTPrd - %s - Error] " fmt "\n",(char*)&timestr, \
80-
## args); \
81-
fflush(stderr); \
82-
} while (0)
83-
84-
#define PRINT_WARN(fmt, args...) do { \
85-
char timestr[32]; \
86-
timestamp((char*)&timestr, sizeof(timestr)); \
87-
fprintf(stdout, \
88-
"[uMTPrd - %s - Warning] " fmt "\n",(char*)&timestr, \
89-
## args); \
90-
fflush(stdout); \
91-
} while (0)
66+
#define PRINT_MSG(fmt, args...) do { \
67+
char timestr[32]; \
68+
timestamp((char*)&timestr, sizeof(timestr)); \
69+
fprintf(stdout, \
70+
"[uMTPrd - %s - Info] " fmt "\n",(char*)&timestr, \
71+
## args); \
72+
fflush(stdout); \
73+
} while (0)
74+
75+
#define PRINT_ERROR(fmt, args...) do { \
76+
char timestr[32]; \
77+
timestamp((char*)&timestr, sizeof(timestr)); \
78+
fprintf(stderr, \
79+
"[uMTPrd - %s - Error] " fmt "\n",(char*)&timestr, \
80+
## args); \
81+
fflush(stderr); \
82+
} while (0)
83+
84+
#define PRINT_WARN(fmt, args...) do { \
85+
char timestr[32]; \
86+
timestamp((char*)&timestr, sizeof(timestr)); \
87+
fprintf(stdout, \
88+
"[uMTPrd - %s - Warning] " fmt "\n",(char*)&timestr, \
89+
## args); \
90+
fflush(stdout); \
91+
} while (0)
9292

9393
#ifdef DEBUG
94-
#define PRINT_DEBUG(fmt, args...) do { \
95-
char timestr[32]; \
96-
timestamp((char*)&timestr, sizeof(timestr)); \
97-
fprintf(stdout, \
98-
"[uMTPrd - %s - Debug] " fmt "\n",(char*)&timestr, \
99-
## args); \
100-
fflush(stdout); \
101-
} while (0)
94+
#define PRINT_DEBUG(fmt, args...) do { \
95+
char timestr[32]; \
96+
timestamp((char*)&timestr, sizeof(timestr)); \
97+
fprintf(stdout, \
98+
"[uMTPrd - %s - Debug] " fmt "\n",(char*)&timestr, \
99+
## args); \
100+
fflush(stdout); \
101+
} while (0)
102102
#else
103103

104104
#define PRINT_DEBUG(fmt, args...)

‎inc/mtp.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* uMTP Responder
3-
* Copyright (c) 2018 - 2024 Viveris Technologies
3+
* Copyright (c) 2018 - 2025 Viveris Technologies
44
*
55
* uMTP Responder is free software; you can redistribute it and/or
66
* modify it under the terms of the GNU General Public
@@ -173,6 +173,6 @@ int build_response(mtp_ctx * ctx, uint32_t tx_id, uint16_t type, uint16_t status
173173
int check_and_send_USB_ZLP(mtp_ctx * ctx , int size);
174174
int parse_incoming_dataset(mtp_ctx * ctx,void * datain,int size,uint32_t * newhandle, uint32_t parent_handle, uint32_t storage_id);
175175

176-
#define APP_VERSION "v1.6.8"
176+
#define APP_VERSION "v1.6.9"
177177

178178
#endif

‎inc/mtp_cfg.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* uMTP Responder
3-
* Copyright (c) 2018 - 2024 Viveris Technologies
3+
* Copyright (c) 2018 - 2025 Viveris Technologies
44
*
55
* uMTP Responder is free software; you can redistribute it and/or
66
* modify it under the terms of the GNU General Public

‎inc/mtp_constant_strings.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* uMTP Responder
3-
* Copyright (c) 2018 - 2024 Viveris Technologies
3+
* Copyright (c) 2018 - 2025 Viveris Technologies
44
*
55
* uMTP Responder is free software; you can redistribute it and/or
66
* modify it under the terms of the GNU General Public

‎inc/mtp_datasets.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* uMTP Responder
3-
* Copyright (c) 2018 - 2024 Viveris Technologies
3+
* Copyright (c) 2018 - 2025 Viveris Technologies
44
*
55
* uMTP Responder is free software; you can redistribute it and/or
66
* modify it under the terms of the GNU General Public

‎inc/mtp_helpers.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* uMTP Responder
3-
* Copyright (c) 2018 - 2024 Viveris Technologies
3+
* Copyright (c) 2018 - 2025 Viveris Technologies
44
*
55
* uMTP Responder is free software; you can redistribute it and/or
66
* modify it under the terms of the GNU General Public

‎inc/mtp_operations.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* uMTP Responder
3-
* Copyright (c) 2018 - 2024 Viveris Technologies
3+
* Copyright (c) 2018 - 2025 Viveris Technologies
44
*
55
* uMTP Responder is free software; you can redistribute it and/or
66
* modify it under the terms of the GNU General Public

0 commit comments

Comments
 (0)