Changeset 1301

Timestamp:

08/21/11 01:24:17 (21 months ago)

Author:

reyalp

Message:

fix ptp enums, don't want anonymous enum variables

File:

• trunk/core/ptp.h (modified) (5 diffs)

trunk/core/ptp.h

@@ -22 +22 @@
 
 // N.B.: unused parameters should be set to 0
-enum {
+enum ptp_chdk_command {
   PTP_CHDK_Version = 0,     // return param1 is major version number
                             // return param2 is minor version number
@@ -64 +64 @@
                             // input messages do not have type or subtype, they are always a string destined for the script (similar to USER/string)
                             // output param1 is ptp_chdk_script_msg_status
-} ptp_chdk_command;
+};
 
 // data types as used by ReadScriptMessage
-enum {
+enum ptp_chdk_script_data_type {
   PTP_CHDK_TYPE_UNSUPPORTED = 0, // type name will be returned in data
   PTP_CHDK_TYPE_NIL,
@@ -76 +76 @@
                         // this function can be overridden in lua to change the format
                         // the string may be empty for an empty table
-} ptp_chdk_script_data_type;
+};
 
 // TempData flags
@@ -96 +96 @@
 
 // message types
-enum {
+enum ptp_chdk_script_msg_type {
     PTP_CHDK_S_MSGTYPE_NONE = 0, // no messages waiting
     PTP_CHDK_S_MSGTYPE_ERR,      // error message
@@ -102 +102 @@
     PTP_CHDK_S_MSGTYPE_USER,     // message queued by script
 // TODO chdk console data ?
-} ptp_chdk_script_msg_type;
+};
 
 // error subtypes for PTP_CHDK_S_MSGTYPE_ERR and script startup status
-enum {
+enum ptp_chdk_script_error_type {
     PTP_CHDK_S_ERRTYPE_NONE = 0,
     PTP_CHDK_S_ERRTYPE_COMPILE,
     PTP_CHDK_S_ERRTYPE_RUN,
-} ptp_chdk_script_error_type;
+};
 
 // message status
-enum {
+enum ptp_chdk_script_msg_status {
     PTP_CHDK_S_MSGSTATUS_OK = 0, // queued ok
     PTP_CHDK_S_MSGSTATUS_NOTRUN, // no script is running
     PTP_CHDK_S_MSGSTATUS_QFULL,  // queue is full
     PTP_CHDK_S_MSGSTATUS_BADID,  // specified ID is not running
-} ptp_chdk_script_msg_status;
+};
 #endif // __CHDK_PTP_H