Diff: PIMA15740/PIMA15740_types.h

Revision:

3:1fcb46ab18df

Parent:

1:71c0e9dc153d

Child:

10:fc1cb68fc91e

--- a/PIMA15740/PIMA15740_types.h	Fri Aug 23 20:02:44 2013 +0000
+++ b/PIMA15740/PIMA15740_types.h	Fri Aug 23 23:34:05 2013 +0000
@@ -1,21 +1,33 @@
-/* mbed USBHostPTP Library(PIMA15740 definitions)
- * Copyright (c) 2013 Dwayne Dilbeck
- * This software is distributed under the terms of the GNU Lesser General Public License
+/**
+*  @file PIMA15740_types.h
+*  @brief PIMA type definitions
+*  @author Dwayne Dilbeck
+*  @date 8/23/2013
+* 
+* @par Copyright:
+*  Copyright (c) 2013 Dwayne Dilbeck
+* @par License:
+*  This software is distributed under the terms of the GNU Lesser General Public License
+*
+*  mbed USBHostPTP Library(PIMA15740 Constants definition)
  */
  
 #include "PIMAconst.h"
 #include "PIMAArray.h"
 #include "PIMAString.h"
 
-        
+/** @struct PIMAContainer
+ *  PIMA 15740:2000 standard Appendix D.7.1.1   
+*/      
 typedef __packed struct {
-     uint32_t len;
+     uint32_t length;
      uint16_t type;
-     uint16_t opcode;
-     uint32_t TransactionID;
-     uint32_t param[5];
+     uint16_t code;
+     uint32_t transactionID;
+     uint32_t payload[5];
     } PIMAContainer;
-        
+
+/// PIMA 15740:2000 standard 5.5.1 Table 6        
 typedef struct {
     uint16_t            standardVersion;
     uint32_t            vendorExtensionID;
@@ -33,6 +45,7 @@
     PIMAString          serialNumber;
 } DeviceInfoStruct;
 
+/// PIMA 15740:2000 standard 5.5.2 Table 8
 typedef struct {
     uint32_t   storageID;            //0x0
     uint16_t   objectFormat;         //0x4
@@ -49,9 +62,20 @@
     uint16_t   associationType;      //0x2a
     uint32_t   associationDesc;      //0x2c
     uint32_t   sequenceNumber;       //0x30
-    PIMAString filename;           //0x34
+    PIMAString filename;             //0x34
     PIMAString captureDate; 
     PIMAString modificationDate;
     PIMAString keywords;
 } ObjectInfoStruct;
 
+/// PIMA 15740:2000 standard 5.5.3 Table 10
+typedef struct {
+    uint16_t   storageType;
+    uint16_t   fileSystemType;
+    uint16_t   accessCapability;
+    uint64_t   maxCapacity;
+    uint64_t   freeSpaceInBytes;
+    uint32_t   freeSpaceInImages;
+    PIMAString storageDescription;
+    PIMAString volumeLabel;
+} StorageInfoStruct;