Trond Enger / d7a_1x

Important changes to repositories hosted on mbed.com

Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.

To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.

It is also possible to export all your personal repositories from the account settings page.

Fork of d7a_1x by WizziLab

src/d7a_fs.cpp@52:c7a58fc48bd2, 2016-09-06 (annotated)

Committer:
Jeej
Date:
Tue Sep 06 15:23:39 2016 +0000
Revision:
52:c7a58fc48bd2
Parent:
51:644de6fe1ee7
Child:
56:da34fc11e760
Updated comments

Who changed what in which revision?

UserRevisionLine numberNew contents of line
Jeej 25:aac250164497 1 #include "mbed.h"
Jeej 25:aac250164497 2 #include "rtos.h"
Jeej 25:aac250164497 3 #include "dbg.h"
Jeej 25:aac250164497 4 #include "d7a_com.h"
Jeej 25:aac250164497 5 #include "d7a_common.h"
Jeej 25:aac250164497 6 #include "d7a_fs.h"
Jeej 43:28202405094d 7 #include "d7a.h"
Jeej 25:aac250164497 8
Jeej 25:aac250164497 9
Jeej 25:aac250164497 10 #define FS_MAX_FILE_QTY 256
Jeej 25:aac250164497 11 #define FS_MAX_MIRROR_QTY 32
Jeej 25:aac250164497 12 #define FS_MAX_WATCHERS_QTY 32
Jeej 25:aac250164497 13
Jeej 25:aac250164497 14 #define FS_NULL_MAP 0xFF // XXX: this actually removes usage of file 255
Jeej 25:aac250164497 15
Jeej 25:aac250164497 16 TYPEDEF_STRUCT_PACKED {
Jeej 30:d775c1409849 17 uint8_t id;
Jeej 25:aac250164497 18 uint8_t cmd;
Jeej 25:aac250164497 19 uint8_t fid;
Jeej 25:aac250164497 20 uint32_t offset;
Jeej 25:aac250164497 21 uint32_t length;
Jeej 25:aac250164497 22 } d7a_fs_com_req_t;
Jeej 25:aac250164497 23
Jeej 25:aac250164497 24 TYPEDEF_STRUCT_PACKED {
Jeej 30:d775c1409849 25 uint8_t id;
Jeej 25:aac250164497 26 uint8_t cmd;
Jeej 30:d775c1409849 27 int8_t status;
Jeej 25:aac250164497 28 uint32_t length;
Jeej 25:aac250164497 29 uint8_t data[1];
Jeej 25:aac250164497 30 } d7a_fs_com_resp_t;
Jeej 25:aac250164497 31
Jeej 25:aac250164497 32 typedef struct {
Jeej 25:aac250164497 33 d7a_fs_com_req_t req;
Jeej 34:1311cc53201a 34 int8_t status;
Jeej 25:aac250164497 35 void* data;
Jeej 25:aac250164497 36 } d7a_fs_com_t;
Jeej 25:aac250164497 37
Jeej 25:aac250164497 38 typedef struct {
Jeej 25:aac250164497 39 Thread* thread;
Jeej 26:9f0b9833cac6 40 Queue<void, 8> fs_done;
Jeej 49:81d5bddb02f0 41 WriteFileFunction write_file;
Jeej 49:81d5bddb02f0 42 ReadFileFunction read_file;
Jeej 25:aac250164497 43 Queue<d7a_com_rx_msg_t, 16> pkt_queue;
Jeej 25:aac250164497 44 uint8_t hdr_map[FS_MAX_FILE_QTY];
Jeej 25:aac250164497 45 uint8_t nb_files;
Jeej 30:d775c1409849 46 d7a_fs_com_t com[FS_MAX_CONCURRENCY];
Jeej 25:aac250164497 47 } d7a_fs_ctx_t;
Jeej 25:aac250164497 48
Jeej 25:aac250164497 49 d7a_fs_ctx_t g_fs_ctx;
Jeej 25:aac250164497 50
Jeej 25:aac250164497 51 void d7a_fs_thread(const void *p);
Jeej 25:aac250164497 52
Jeej 49:81d5bddb02f0 53 d7a_errors_t d7a_fs_open(WriteFileFunction wf, ReadFileFunction rf)
Jeej 25:aac250164497 54 {
Jeej 25:aac250164497 55 FPRINT("\r\n");
Jeej 25:aac250164497 56
Jeej 49:81d5bddb02f0 57 g_fs_ctx.write_file = wf;
Jeej 49:81d5bddb02f0 58 g_fs_ctx.read_file = rf;
Jeej 31:ab9bfdbc6b44 59 g_fs_ctx.thread = new Thread(d7a_fs_thread, NULL, osPriorityHigh, DEFAULT_STACK_SIZE);
Jeej 49:81d5bddb02f0 60
Jeej 49:81d5bddb02f0 61 return D7A_ERR_NONE;
Jeej 25:aac250164497 62 }
Jeej 25:aac250164497 63
Jeej 25:aac250164497 64 static void d7a_fs_msg(uint8_t* buf, uint8_t len, uint8_t id)
Jeej 25:aac250164497 65 {
Jeej 25:aac250164497 66 FPRINT("\r\n");
Jeej 25:aac250164497 67 d7a_com_tx_msg_t msg;
Jeej 25:aac250164497 68 msg.id = id;
Jeej 25:aac250164497 69 msg.pbuf = buf;
Jeej 25:aac250164497 70 msg.plen = len;
Jeej 25:aac250164497 71 msg.alen = 0;
Jeej 34:1311cc53201a 72 d7a_com_post_msg(&msg);
Jeej 25:aac250164497 73 }
Jeej 25:aac250164497 74
Jeej 25:aac250164497 75 void d7a_fs_new_pkt(d7a_com_rx_msg_t* pkt)
Jeej 25:aac250164497 76 {
Jeej 25:aac250164497 77 FPRINT("\r\n");
Jeej 25:aac250164497 78 ASSERT(g_fs_ctx.pkt_queue.put(pkt) == osOK, "FS queue full!\r\n");
Jeej 25:aac250164497 79 }
Jeej 25:aac250164497 80
Jeej 25:aac250164497 81 d7a_com_rx_msg_t* d7a_fs_wait_pkt( uint32_t millisec )
Jeej 25:aac250164497 82 {
Jeej 30:d775c1409849 83 FPRINT("(millisec:%d)\r\n", millisec);
Jeej 25:aac250164497 84 osEvent evt = g_fs_ctx.pkt_queue.get(millisec);
Jeej 25:aac250164497 85 return (evt.status == osEventMessage)? (d7a_com_rx_msg_t*)evt.value.p : NULL;
Jeej 25:aac250164497 86 }
Jeej 25:aac250164497 87
Jeej 27:934ab7455115 88
Jeej 30:d775c1409849 89 #define OP_SIZE_RD 11
Jeej 30:d775c1409849 90 #define OP_SIZE_WR 11
Jeej 30:d775c1409849 91 #define OP_SIZE_TOUCH 11
Jeej 41:a924aa709b6f 92 #define OP_SIZE_SYNC 11
Jeej 30:d775c1409849 93 #define OP_SIZE_STAT 3
Jeej 30:d775c1409849 94 #define OP_SIZE_FLUSH 3
Jeej 30:d775c1409849 95 #define OP_SIZE_CREATE 11
Jeej 30:d775c1409849 96 #define OP_SIZE_RETSTAT (3+4)
Jeej 30:d775c1409849 97 #define OP_SIZE_RETDATA (3+4)
Jeej 41:a924aa709b6f 98 uint8_t k_valid_cmd[] = {FS_OP_RD, FS_OP_WR, FS_OP_TOUCH ,FS_OP_STAT, FS_OP_FLUSH, FS_OP_CREATE, FS_OP_SYNC};
Jeej 41:a924aa709b6f 99 uint8_t k_valid_size[]= {OP_SIZE_RD,OP_SIZE_WR,OP_SIZE_TOUCH,OP_SIZE_STAT,OP_SIZE_FLUSH,OP_SIZE_CREATE,OP_SIZE_SYNC};
Jeej 41:a924aa709b6f 100
Jeej 52:c7a58fc48bd2 101 // ------------------------------------------------------------------
Jeej 52:c7a58fc48bd2 102 // |TOKEN|CMD/RESP| PAYLOAD |
Jeej 52:c7a58fc48bd2 103 // --------------------------------------------------------------
Jeej 52:c7a58fc48bd2 104 // | 1B | 1B | PKT.blen - 1 bytes |
Jeej 52:c7a58fc48bd2 105 // --------------------------------------------------------------
Jeej 52:c7a58fc48bd2 106 // | | | 1B | 4B | 4B | PKT.blen - 11 bytes|
Jeej 52:c7a58fc48bd2 107 // --------------------------------------------------------------
Jeej 30:d775c1409849 108 // | | write | FID | offset | length | datas... |
Jeej 30:d775c1409849 109 // | | read | FID | offset | length |
Jeej 30:d775c1409849 110 // | | touch | FID | offset | length |
Jeej 30:d775c1409849 111 // | | exist | FID |
Jeej 30:d775c1409849 112 // | | flush | FID |
Jeej 30:d775c1409849 113 // | | retstat|status| length | <kal_fs_properties_t>
Jeej 30:d775c1409849 114 // | | retdat |status| length | datas... |
Jeej 25:aac250164497 115 void d7a_fs_thread(const void *p)
Jeej 25:aac250164497 116 {
Jeej 25:aac250164497 117 FPRINT("\r\n");
Jeej 25:aac250164497 118 d7a_com_rx_msg_t* pkt;
Jeej 26:9f0b9833cac6 119 int8_t status = FS_STAT_OK;
Jeej 25:aac250164497 120
Jeej 25:aac250164497 121 while (true)
Jeej 25:aac250164497 122 {
Jeej 25:aac250164497 123 status = FS_STAT_OK;
Jeej 25:aac250164497 124 // TODO: For now only one outgoing-request can be pending
Jeej 25:aac250164497 125 // An incoming-request response can be served simultaneously
Jeej 25:aac250164497 126 // TODO: handle segmentation. For now MTU = 255-10 = 245
Jeej 25:aac250164497 127 pkt = d7a_fs_wait_pkt();
Jeej 25:aac250164497 128 ASSERT(pkt != NULL, "FS NULL pkt\r\n");
Jeej 25:aac250164497 129 // ---------------------------------------------------------------------------
Jeej 25:aac250164497 130 // Peer request
Jeej 25:aac250164497 131 // ---------------------------------------------------------------------------
Jeej 25:aac250164497 132 switch (pkt->id)
Jeej 25:aac250164497 133 {
Jeej 25:aac250164497 134 case KAL_COM_FLOW_FS_CMD:
Jeej 25:aac250164497 135 d7a_fs_com_req_t* req = (d7a_fs_com_req_t*)pkt->buffer;
Jeej 34:1311cc53201a 136 DPRINT("Rfs[%d](%d) cmd:%d\n", req->fid, req->id, req->cmd);
Jeej 30:d775c1409849 137 //dbg_print_data("%02X ", (uint8_t*)req, sizeof(d7a_fs_com_req_t));
Jeej 30:d775c1409849 138 //DPRINT("\r\n");
Jeej 30:d775c1409849 139 d7a_fs_com_resp_t buf = (d7a_fs_com_resp_t) {.id = req->id, .cmd = FS_OP_RETSTAT};
Jeej 25:aac250164497 140
Jeej 25:aac250164497 141 // Error management makes sense here as we face peer-requests,
Jeej 25:aac250164497 142 // and we don't want to assert because of the peer.
Jeej 25:aac250164497 143 //status = d7a_fs_check_req(req, pkt->blen);
Jeej 25:aac250164497 144 //buf.status = status;
Jeej 25:aac250164497 145 buf.status = FS_STAT_OK;
Jeej 25:aac250164497 146
Jeej 25:aac250164497 147 // From here we assume that the request is valid
Jeej 25:aac250164497 148 // TODO: for now we consider that COM-FS request are targetting
Jeej 25:aac250164497 149 // FIDs that are "local" to the Host, but we can extend this
Jeej 25:aac250164497 150 // to "distant" files as well.(i.e. access SPI-Flash of an Host)
Jeej 25:aac250164497 151 if (status != FS_STAT_OK)
Jeej 25:aac250164497 152 {
Jeej 25:aac250164497 153 buf.length = 0;
Jeej 25:aac250164497 154 // Here we respond to request errors and OP_STAT
Jeej 25:aac250164497 155 d7a_fs_msg((uint8_t*)&buf,OP_SIZE_RETSTAT, KAL_COM_FLOW_FS_RESP);
Jeej 25:aac250164497 156 }
Jeej 25:aac250164497 157 else if (req->cmd == FS_OP_RD)
Jeej 25:aac250164497 158 {
Jeej 25:aac250164497 159 d7a_fs_com_resp_t* b = (d7a_fs_com_resp_t*)MALLOC(OP_SIZE_RETDATA + req->length);
Jeej 51:644de6fe1ee7 160 ASSERT(g_fs_ctx.read_file != NULL, "FS Read callback not implemented!\r\n");
Jeej 49:81d5bddb02f0 161 uint32_t len = g_fs_ctx.read_file(req->fid, req->offset, req->length, &b->data[0]);
Jeej 51:644de6fe1ee7 162
Jeej 30:d775c1409849 163 b->id = req->id;
Jeej 25:aac250164497 164 b->cmd = FS_OP_RETDATA;
Jeej 51:644de6fe1ee7 165 if (len == req->length)
Jeej 51:644de6fe1ee7 166 {
Jeej 51:644de6fe1ee7 167 b->length = len;
Jeej 51:644de6fe1ee7 168 b->status = FS_STAT_OK;
Jeej 51:644de6fe1ee7 169 }
Jeej 51:644de6fe1ee7 170 else
Jeej 51:644de6fe1ee7 171 {
Jeej 51:644de6fe1ee7 172 b->length = 0;
Jeej 51:644de6fe1ee7 173 b->status = FS_STAT_ERR_FID_NOEXIST;
Jeej 51:644de6fe1ee7 174 WARNING(false, "FS_STAT_ERR_FID_NOEXIST\r\n");
Jeej 51:644de6fe1ee7 175 }
Jeej 51:644de6fe1ee7 176
Jeej 51:644de6fe1ee7 177 d7a_fs_msg((uint8_t*)b, OP_SIZE_RETDATA + b->length, KAL_COM_FLOW_FS_RESP);
Jeej 25:aac250164497 178 FREE(b);
Jeej 25:aac250164497 179 }
Jeej 25:aac250164497 180 else if (req->cmd == FS_OP_WR)
Jeej 25:aac250164497 181 {
Jeej 51:644de6fe1ee7 182 ASSERT(g_fs_ctx.write_file != NULL, "FS Write callback not implemented!\r\n");
Jeej 49:81d5bddb02f0 183 buf.length = g_fs_ctx.write_file(req->fid, req->offset, req->length, &pkt->buffer[OP_SIZE_WR]);
Jeej 25:aac250164497 184 d7a_fs_msg((uint8_t*)&buf, OP_SIZE_RETSTAT, KAL_COM_FLOW_FS_RESP);
Jeej 25:aac250164497 185 }
Jeej 45:b85384e7d825 186 else if (req->cmd == FS_OP_TOUCH)
Jeej 45:b85384e7d825 187 {
Jeej 45:b85384e7d825 188 DPRINT("PS Touch f:%d o:%d s:%d\r\n", req->fid, req->offset, req->length);
Jeej 45:b85384e7d825 189 //buf.length = g_fs_ctx.callback->touch_file(req->fid, req->offset, req->length);
Jeej 45:b85384e7d825 190 d7a_fs_msg((uint8_t*)&buf, OP_SIZE_RETSTAT, KAL_COM_FLOW_FS_RESP);
Jeej 45:b85384e7d825 191 }
Jeej 26:9f0b9833cac6 192 else
Jeej 26:9f0b9833cac6 193 {
Jeej 43:28202405094d 194 ASSERT(false, "FS: Unsupported cmd %d\r\n", req->cmd);
Jeej 26:9f0b9833cac6 195 }
Jeej 25:aac250164497 196 break;
Jeej 25:aac250164497 197 // ---------------------------------------------------------------------------
Jeej 25:aac250164497 198 // Response to our commands
Jeej 25:aac250164497 199 // ---------------------------------------------------------------------------
Jeej 25:aac250164497 200 case KAL_COM_FLOW_FS_RESP:
Jeej 43:28202405094d 201 ASSERT(false, "FS: Commands are not used\r\n");
Jeej 25:aac250164497 202 break;
Jeej 25:aac250164497 203 default:
Jeej 25:aac250164497 204 EPRINT("FS Unknown Flow ID 0x%02X\r\n", pkt->id);
Jeej 25:aac250164497 205 break;
Jeej 25:aac250164497 206 }
Jeej 25:aac250164497 207 FREE(pkt);
Jeej 25:aac250164497 208 }
Jeej 25:aac250164497 209 }