forked from felis/PTP_2.0
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request felis#5 from janhruby/master
Solves "PROGMEM causes a section type conflict"
- Loading branch information
Showing
1 changed file
with
9 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,9 +14,10 @@ Circuits At Home, LTD | |
Web : http://www.circuitsathome.com | ||
e-mail : [email protected] | ||
*/ | ||
|
||
#include "ptpconstitles.h" | ||
|
||
const char* ptpopNames[] PROGMEM = | ||
const char* const ptpopNames[] PROGMEM = | ||
{ | ||
msgUndefined, | ||
msgGetDeviceInfo, | ||
|
@@ -49,7 +50,7 @@ const char* ptpopNames[] PROGMEM = | |
msgInitiateOpenCapture | ||
}; | ||
|
||
const char* mtpopNames[] PROGMEM = | ||
const char* const mtpopNames[] PROGMEM = | ||
{ | ||
msgUndefined, | ||
msgGetObjectPropsSupported, | ||
|
@@ -62,7 +63,7 @@ const char* mtpopNames[] PROGMEM = | |
msgSendObjectPropList | ||
}; | ||
|
||
const char* ptpevNames[] PROGMEM = | ||
const char* const ptpevNames[] PROGMEM = | ||
{ | ||
msgUndefined, | ||
msgCancelTransaction, | ||
|
@@ -81,15 +82,15 @@ const char* ptpevNames[] PROGMEM = | |
msgUnreportedStatus | ||
}; | ||
|
||
const char* mtpevNames[] PROGMEM = | ||
const char* const mtpevNames[] PROGMEM = | ||
{ | ||
msgUndefined, | ||
msgObjectPropChanged, | ||
msgObjectPropDescChanged, | ||
msgObjectReferencesChanged | ||
}; | ||
|
||
const char* ptpprNames[] PROGMEM = | ||
const char* const ptpprNames[] PROGMEM = | ||
{ | ||
msgUndefined, | ||
msgBatteryLevel, | ||
|
@@ -125,7 +126,7 @@ const char* ptpprNames[] PROGMEM = | |
msgCopyrightInfo | ||
}; | ||
|
||
const char* mtpprNames[] PROGMEM = | ||
const char* const mtpprNames[] PROGMEM = | ||
{ | ||
msgUndefined, | ||
msgSynchronization_Partner, | ||
|
@@ -140,7 +141,7 @@ const char* mtpprNames[] PROGMEM = | |
msgPlayback_Container | ||
}; | ||
|
||
const char* acNames[] PROGMEM = | ||
const char* const acNames[] PROGMEM = | ||
{ | ||
msgUndefined, | ||
msgAssociation, | ||
|
@@ -158,7 +159,7 @@ const char* acNames[] PROGMEM = | |
msgQT | ||
}; | ||
|
||
const char* imNames[] PROGMEM = | ||
const char* const imNames[] PROGMEM = | ||
{ | ||
msgUndefined, | ||
msgEXIF_JPEG, | ||
|