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@83:f4054d0b29ba, 2017-01-05 (annotated)

Committer:
Jeej
Date:
Thu Jan 05 12:59:13 2017 +0000
Revision:
83:f4054d0b29ba
Parent:
79:82b01c1a62f6
Child:
84:e5388f1b8ed9
Selective FPRINT

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