diff --git a/docs/fdkernel.lsm b/docs/fdkernel.lsm index ca3d085..90a4af2 100644 --- a/docs/fdkernel.lsm +++ b/docs/fdkernel.lsm @@ -1,7 +1,7 @@ Begin3 Title: The FreeDOS Kernel -Version: 2.0.33 -Entered-date: 31 Jan 2004 +Version: 2.0.34 +Entered-date: xx Apr 2004 Description: The FreeDOS Kernel. Keywords: kernel freedos dos msdos Author: (developers) diff --git a/hdr/version.h b/hdr/version.h index 99398dc..6370da7 100644 --- a/hdr/version.h +++ b/hdr/version.h @@ -47,8 +47,8 @@ static BYTE *date_hRcsId = #define REVISION_MAJOR 1 #define REVISION_MINOR 1 -#define REVISION_SEQ 33 -#define BUILD "2033" -#define SUB_BUILD "" -#define KERNEL_VERSION_STRING "1.1.33" /*#REVISION_MAJOR "." #REVISION_MINOR "." #REVISION_SEQ */ -#define KERNEL_BUILD_STRING "2033" /*#BUILD SUB_BUILD */ +#define REVISION_SEQ 34 +#define BUILD "2034" +#define SUB_BUILD "rc" +#define KERNEL_VERSION_STRING "1.1.34" /*#REVISION_MAJOR "." #REVISION_MINOR "." #REVISION_SEQ */ +#define KERNEL_BUILD_STRING "2034rc" /*#BUILD SUB_BUILD */ diff --git a/kernel/chario.c b/kernel/chario.c index 89de4d3..bb905f7 100644 --- a/kernel/chario.c +++ b/kernel/chario.c @@ -174,6 +174,8 @@ void update_scr_pos(unsigned char c, unsigned char count) scr_pos = scrpos; } +STATIC int raw_get_char(struct dhdr FAR **pdev, BOOL check_break); + /* writes a character in cooked mode; maybe with printer echo; handles TAB expansion */ STATIC int cooked_write_char(struct dhdr FAR **pdev, @@ -290,15 +292,6 @@ STATIC void destr_bs(int sft_idx) /* READ FUNCTIONS */ -STATIC unsigned char read_char_sft_dev(int sft_in, int sft_out, - struct dhdr FAR **pdev, - BOOL check_break); - -STATIC int raw_get_char(struct dhdr FAR **pdev, BOOL check_break) -{ - return read_char_sft_dev(-1, -1, pdev, check_break); -} - long cooked_read(struct dhdr FAR **pdev, size_t n, char FAR *bp) { unsigned xfer = 0; @@ -361,6 +354,11 @@ STATIC unsigned char read_char_sft_dev(int sft_in, int sft_out, return c; } +STATIC int raw_get_char(struct dhdr FAR **pdev, BOOL check_break) +{ + return read_char_sft_dev(-1, -1, pdev, check_break); +} + unsigned char read_char(int sft_in, int sft_out, BOOL check_break) { struct dhdr FAR *dev = sft_to_dev(idx_to_sft(sft_in));