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@79:82b01c1a62f6, 2016-12-21 (annotated)

Committer:
Jeej
Date:
Wed Dec 21 15:08:51 2016 +0000
Revision:
79:82b01c1a62f6
Parent:
78:f1c0affd99e7
Child:
83:f4054d0b29ba
Unitary debug prints.

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