Skip to content

Commit

Permalink
turn properties definitions as const.
Browse files Browse the repository at this point in the history
  • Loading branch information
@jfdelnero
jfdelnero committed Nov 6, 2023
1 parent 3f7f088 commit a230b01
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 35 deletions.
6 changes: 3 additions & 3 deletions inc/mtp_properties.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ typedef struct format_property_
uint16_t * properties;
}formats_property;

extern profile_property dev_properties[];
extern profile_property properties[];
extern formats_property fmt_properties[];
extern const profile_property dev_properties[];
extern const profile_property properties[];
extern const formats_property fmt_properties[];

int build_properties_supported_dataset(mtp_ctx * ctx,void * buffer, int maxsize,uint32_t format_id);
int build_properties_dataset(mtp_ctx * ctx,void * buffer, int maxsize,uint32_t property_id,uint32_t format_id);
Expand Down
64 changes: 32 additions & 32 deletions src/mtp_properties.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

#include "logs_out.h"

formats_property fmt_properties[]=
const formats_property fmt_properties[]=
{ // prop_code data_type getset default value group code
{ MTP_FORMAT_UNDEFINED , (uint16_t[]){ MTP_PROPERTY_STORAGE_ID, MTP_PROPERTY_OBJECT_FORMAT, MTP_PROPERTY_PROTECTION_STATUS, MTP_PROPERTY_OBJECT_SIZE,
MTP_PROPERTY_OBJECT_FILE_NAME, MTP_PROPERTY_DATE_MODIFIED, MTP_PROPERTY_PARENT_OBJECT, MTP_PROPERTY_PERSISTENT_UID,
Expand Down Expand Up @@ -211,36 +211,36 @@ formats_property fmt_properties[]=

};

profile_property properties[]=
{ // prop_code data_type getset default value group code format id
{MTP_PROPERTY_STORAGE_ID, MTP_TYPE_UINT32, 0x00, 0x00000000 , 0x000000001 , 0x00 , 0xFFFF },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_UNDEFINED , 0x000000000 , 0x00 , MTP_FORMAT_UNDEFINED },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_ASSOCIATION, 0x000000000 , 0x00 , MTP_FORMAT_ASSOCIATION },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_TEXT , 0x000000000 , 0x00 , MTP_FORMAT_TEXT },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_HTML , 0x000000000 , 0x00 , MTP_FORMAT_HTML },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_WAV , 0x000000000 , 0x00 , MTP_FORMAT_WAV },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_MP3 , 0x000000000 , 0x00 , MTP_FORMAT_MP3 },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_MPEG , 0x000000000 , 0x00 , MTP_FORMAT_MPEG },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_EXIF_JPEG , 0x000000000 , 0x00 , MTP_FORMAT_EXIF_JPEG },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_BMP , 0x000000000 , 0x00 , MTP_FORMAT_BMP },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_AIFF , 0x000000000 , 0x00 , MTP_FORMAT_AIFF },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_MPEG , 0x000000000 , 0x00 , MTP_FORMAT_MPEG },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_WMA , 0x000000000 , 0x00 , MTP_FORMAT_WMA },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_OGG , 0x000000000 , 0x00 , MTP_FORMAT_OGG },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_AAC , 0x000000000 , 0x00 , MTP_FORMAT_AAC },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_MP4_CONTAINER , 0x000000000 , 0x00 , MTP_FORMAT_MP4_CONTAINER },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_3GP_CONTAINER , 0x000000000 , 0x00 , MTP_FORMAT_3GP_CONTAINER },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_ABSTRACT_AV_PLAYLIST , 0x000000000 , 0x00 , MTP_FORMAT_ABSTRACT_AV_PLAYLIST },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_WPL_PLAYLIST , 0x000000000 , 0x00 , MTP_FORMAT_WPL_PLAYLIST },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_M3U_PLAYLIST , 0x000000000 , 0x00 , MTP_FORMAT_M3U_PLAYLIST },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_PLS_PLAYLIST , 0x000000000 , 0x00 , MTP_FORMAT_PLS_PLAYLIST },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_XML_DOCUMENT , 0x000000000 , 0x00 , MTP_FORMAT_XML_DOCUMENT },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_FLAC , 0x000000000 , 0x00 , MTP_FORMAT_FLAC },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_AVI , 0x000000000 , 0x00 , MTP_FORMAT_AVI },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_ASF , 0x000000000 , 0x00 , MTP_FORMAT_ASF },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_MS_WORD_DOCUMENT , 0x000000000 , 0x00 , MTP_FORMAT_MS_WORD_DOCUMENT },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_MS_EXCEL_SPREADSHEET , 0x000000000 , 0x00 , MTP_FORMAT_MS_EXCEL_SPREADSHEET },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_MS_POWERPOINT_PRESENTATION , 0x000000000 , 0x00 , MTP_FORMAT_MS_POWERPOINT_PRESENTATION },
const profile_property properties[]=
{ // prop_code data_type getset default value group code form_flag format id
{MTP_PROPERTY_STORAGE_ID, MTP_TYPE_UINT32, 0x00, 0x00000000 , 0x000000001 , 0x00 , 0xFFFF },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_UNDEFINED , 0x000000000 , 0x00 , MTP_FORMAT_UNDEFINED },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_ASSOCIATION , 0x000000000 , 0x00 , MTP_FORMAT_ASSOCIATION },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_TEXT , 0x000000000 , 0x00 , MTP_FORMAT_TEXT },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_HTML , 0x000000000 , 0x00 , MTP_FORMAT_HTML },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_WAV , 0x000000000 , 0x00 , MTP_FORMAT_WAV },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_MP3 , 0x000000000 , 0x00 , MTP_FORMAT_MP3 },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_MPEG , 0x000000000 , 0x00 , MTP_FORMAT_MPEG },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_EXIF_JPEG , 0x000000000 , 0x00 , MTP_FORMAT_EXIF_JPEG },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_BMP , 0x000000000 , 0x00 , MTP_FORMAT_BMP },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_AIFF , 0x000000000 , 0x00 , MTP_FORMAT_AIFF },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_MPEG , 0x000000000 , 0x00 , MTP_FORMAT_MPEG },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_WMA , 0x000000000 , 0x00 , MTP_FORMAT_WMA },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_OGG , 0x000000000 , 0x00 , MTP_FORMAT_OGG },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_AAC , 0x000000000 , 0x00 , MTP_FORMAT_AAC },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_MP4_CONTAINER , 0x000000000 , 0x00 , MTP_FORMAT_MP4_CONTAINER },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_3GP_CONTAINER , 0x000000000 , 0x00 , MTP_FORMAT_3GP_CONTAINER },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_ABSTRACT_AV_PLAYLIST , 0x000000000 , 0x00 , MTP_FORMAT_ABSTRACT_AV_PLAYLIST },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_WPL_PLAYLIST , 0x000000000 , 0x00 , MTP_FORMAT_WPL_PLAYLIST },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_M3U_PLAYLIST , 0x000000000 , 0x00 , MTP_FORMAT_M3U_PLAYLIST },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_PLS_PLAYLIST , 0x000000000 , 0x00 , MTP_FORMAT_PLS_PLAYLIST },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_XML_DOCUMENT , 0x000000000 , 0x00 , MTP_FORMAT_XML_DOCUMENT },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_FLAC , 0x000000000 , 0x00 , MTP_FORMAT_FLAC },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_AVI , 0x000000000 , 0x00 , MTP_FORMAT_AVI },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_ASF , 0x000000000 , 0x00 , MTP_FORMAT_ASF },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_MS_WORD_DOCUMENT , 0x000000000 , 0x00 , MTP_FORMAT_MS_WORD_DOCUMENT },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_MS_EXCEL_SPREADSHEET , 0x000000000 , 0x00 , MTP_FORMAT_MS_EXCEL_SPREADSHEET },
{MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16, 0x00, MTP_FORMAT_MS_POWERPOINT_PRESENTATION , 0x000000000 , 0x00 , MTP_FORMAT_MS_POWERPOINT_PRESENTATION },

{MTP_PROPERTY_OBJECT_SIZE, MTP_TYPE_UINT64, 0x00, 0x0000000000000000 , 0x000000000 , 0x00 , MTP_FORMAT_ASSOCIATION },
{MTP_PROPERTY_STORAGE_ID, MTP_TYPE_UINT32, 0x00, 0x00000000 , 0x000000000 , 0x00 , MTP_FORMAT_ASSOCIATION },
Expand Down Expand Up @@ -272,7 +272,7 @@ profile_property properties[]=
{0xFFFF, MTP_TYPE_UINT32, 0x00, 0x00000000 , 0x000000000 , 0x00 }
};

profile_property dev_properties[]=
const profile_property dev_properties[]=
{ // prop_code data_type getset default value group code
//{MTP_DEVICE_PROPERTY_SYNCHRONIZATION_PARTNER, MTP_TYPE_UINT32, 0x00, 0x00000000 , 0x000000000 , 0x00 },
//{MTP_DEVICE_PROPERTY_IMAGE_SIZE, MTP_TYPE_UINT32, 0x00, 0x00000000 , 0x000000000 , 0x00 },
Expand Down

0 comments on commit a230b01

Please sign in to comment.