time.t: resolve issue with internal and standard C time.h files and remove all hacks

- fix issue by renaming header file and symbols which consolidate with standard C time.h
- rename also date.h for consistency
- remove all hacks from make files and from sys.c

now can share new dtime.h with standard C time.h without any collision that any order of internal and standard C header path is possible

Author: jmalak

filelist

@@ -34,10 +34,11 @@
 */*/hdr/buffer.h
 */*/hdr/cds.h
 */*/hdr/clock.h
-*/*/hdr/date.h
 */*/hdr/dcb.h
+*/*/hdr/ddate.h
 */*/hdr/device.h
 */*/hdr/dirmatch.h
+*/*/hdr/dtime.h
 */*/hdr/error.h
 */*/hdr/exe.h
 */*/hdr/fat.h
@@ -56,7 +57,6 @@
 */*/hdr/sft.h
 */*/hdr/stacks.inc
 */*/hdr/tail.h
-*/*/hdr/time.h
 */*/hdr/version.h
 */*/hdr/xstructs.h
 */*/kernel/nls/001-437.hc

hdr/date.h renamed to hdr/ddate.h

@@ -51,7 +51,7 @@ static BYTE *date_hRcsId =
 #define EPOCH_DAY       1       /* 1 for January 1                      */
 #define EPOCH_YEAR      1980    /* for Tues 1-1-80 epoch                */
 
-typedef UWORD date;
+typedef UWORD ddate;
 
 #endif
 

hdr/dirmatch.h

@@ -47,8 +47,8 @@ typedef struct {
   UWORD reserved2;
 
   UBYTE dm_attr_fnd;            /* found file attribute         */
-  time dm_time;                 /* file time                    */
-  date dm_date;                 /* file date                    */
+  dtime dm_time;                /* file time                    */
+  ddate dm_date;                /* file date                    */
   ULONG dm_size;                /* file size                    */
   BYTE dm_name[FNAME_SIZE + FEXT_SIZE + 2];     /* file name    */
 } dmatch;

hdr/time.h renamed to hdr/dtime.h

@@ -39,7 +39,7 @@ static BYTE *time_hRcsId =
 #endif
 #endif
 
-typedef UWORD time;
+typedef UWORD dtime;
 
 struct dostime
 {

hdr/fat.h

@@ -105,8 +105,8 @@ struct dirent {
   UWORD dir_crdate;             /* Creation date                */
   UWORD dir_accdate;            /* Last access date             */
   UWORD dir_start_high;         /* High word of the cluster     */
-  time dir_time;                /* Time file created/updated    */
-  date dir_date;                /* Date file created/updated    */
+  dtime dir_time;               /* Time file created/updated    */
+  ddate dir_date;               /* Date file created/updated    */
   UWORD dir_start;              /* Starting cluster             */
   /* 1st available = 2            */
   ULONG dir_size;               /* File size in bytes           */

hdr/fcb.h

@@ -86,8 +86,8 @@ typedef struct {
   UWORD fcb_recsiz;             /* Logical record size in bytes,        */
   /* default = 128                        */
   ULONG fcb_fsize;              /* File size in bytes                   */
-  date fcb_date;                /* Date file created                    */
-  time fcb_time;                /* Time of last write                   */
+  ddate fcb_date;               /* Date file created                    */
+  dtime fcb_time;               /* Time of last write                   */
   /* the following are reserved by system                         */
   BYTE fcb_sftno;               /* Device ID                            */
   BYTE fcb_attrib_hi;           /* share info, dev attrib word hi       */

hdr/sft.h

@@ -61,8 +61,8 @@ typedef struct {
 #else
   CLUSTER sft_stclust;          /* 0b - Starting cluster                     */
 #endif
-  time sft_time;                /* 0d - File time                            */
-  date sft_date;                /* 0f - File date                            */
+  dtime sft_time;               /* 0d - File time                            */
+  ddate sft_date;               /* 0f - File date                            */
   ULONG sft_size;               /* 11 - File size                            */
   ULONG sft_posit;              /* 15 - Current file position                */
   UWORD sft_relclust;           /* 19 - File relative cluster (low part)     */

kernel/dosfns.c

@@ -1130,7 +1130,7 @@ COUNT DosFindNext(void)
   return pop_dmp(rc, dmp);
 }
 
-COUNT DosGetFtime(COUNT hndl, date * dp, time * tp)
+COUNT DosGetFtime(COUNT hndl, ddate * dp, dtime * tp)
 {
   sft FAR *s;
 /*sfttbl FAR *sp;*/
@@ -1144,7 +1144,7 @@ COUNT DosGetFtime(COUNT hndl, date * dp, time * tp)
   return SUCCESS;
 }
 
-COUNT DosSetFtimeSft(int sft_idx, date dp, time tp)
+COUNT DosSetFtimeSft(int sft_idx, ddate dp, dtime tp)
 {
   /* Get the SFT block that contains the SFT      */
   sft FAR *s = idx_to_sft(sft_idx);

kernel/fatfs.c

@@ -52,7 +52,7 @@ COUNT map_cluster(f_node_ptr, COUNT);
 STATIC int shrink_file(f_node_ptr fnp);
 
 /* FAT time notation in the form of hhhh hmmm mmmd dddd (d = double second) */
-STATIC time time_encode(struct dostime *t)
+STATIC dtime time_encode(struct dostime *t)
 {
   return (t->hour << 11) | (t->minute << 5) | (t->second >> 1);
 }
@@ -666,7 +666,7 @@ STATIC int alloc_find_free(f_node_ptr fnp, char *path)
 /*                                                              */
 /* dos_getdate for the file date                                */
 /*                                                              */
-date dos_getdate(void)
+ddate dos_getdate(void)
 {
   struct dosdate dd;
 
@@ -679,7 +679,7 @@ date dos_getdate(void)
 /*                                                              */
 /* dos_gettime for the file time                                */
 /*                                                              */
-time dos_gettime(void)
+dtime dos_gettime(void)
 {
   struct dostime dt;
 

kernel/globals.h

@@ -37,8 +37,8 @@ static BYTE *Globals_hRcsId =
 #include "device.h"
 #include "mcb.h"
 #include "pcb.h"
-#include "date.h"
-#include "time.h"
+#include "ddate.h"
+#include "dtime.h"
 #include "fat.h"
 #include "fcb.h"
 #include "tail.h"