Changeset 33b5477 in buchla-68k for libcio

Timestamp:

07/14/2017 12:36:45 PM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

298f0b4

Parents:

928d5d9

Message:

Fixed argument order.

Location:

libcio

Files:

• conin.c (modified) (1 diff)
• conin.x (modified) (2 diffs)
• dirfns.c (modified) (1 diff)
• dirfns.x (modified) (1 diff)
• filesys.c (modified) (1 diff)
• filesys.x (modified) (1 diff)
• fsinit.c (modified) (1 diff)
• fsinit.x (modified) (1 diff)

libcio/conin.c

@@ -11 +11 @@
 int16_t _CBused;
 
-int16_t _conin(int8_t *buff, int16_t len)
+int16_t _conin(io_arg arg, int8_t *buff, int16_t len)
 {
         int16_t         nbp;

libcio/conin.x

@@ -7 +7 @@
 #pragma once
 
+#include "fspars.h"
 #include "stdint.h"
 
@@ -24 +25 @@
 */
 
-extern  int16_t         _conin(int8_t *buff, int16_t len);
+extern  int16_t         _conin(io_arg arg, int8_t *buff, int16_t len);

libcio/dirfns.c

@@ -78 +78 @@
 */
 
-int8_t *dtunpk(int16_t din, int16_t tin, int16_t fmt, int8_t *s)
+int8_t *dtunpk(int16_t din, int16_t tin, int8_t *s, int16_t fmt)
 {
         register int16_t        ftm, fdt;

libcio/dirfns.x

@@ -16 +16 @@
 
 extern  int8_t          *atrstr(int16_t atr, int8_t s[]);
-extern  int8_t          *dtunpk(int16_t din, int16_t tin, int16_t fmt, int8_t *s);
+extern  int8_t          *dtunpk(int16_t din, int16_t tin, int8_t *s, int16_t fmt);
 extern  int8_t          *mname(int16_t n);

libcio/filesys.c

@@ -90 +90 @@
 */
 
-uint16_t _getfat(uint16_t *bufad, uint16_t nfat, struct bpb *bpp)
+uint16_t _getfat(uint16_t *bufad, struct bpb *bpp, uint16_t nfat)
 {
         uint16_t fatsec;

libcio/filesys.x

@@ -44 +44 @@
 extern  int16_t         _fmake(struct fcb *fcp);
 extern  int16_t         _ftrnc(struct dirent *dp);
-extern  uint16_t        _getfat(uint16_t *bufad, uint16_t nfat, struct bpb *bpp);
+extern  uint16_t        _getfat(uint16_t *bufad, struct bpb *bpp, uint16_t nfat);
 extern  uint16_t        _gtcl12(int8_t *fat, uint16_t cl);
 extern  int16_t         _inifcb(struct fcb *fcp, int8_t *name, int8_t *ext, int16_t mode);

libcio/fsinit.c

@@ -109 +109 @@
 */
 
-void Init_CB(FILE *fp, int8_t unit, int8_t flags, int32_t *bufad, int16_t bufsize)
+void Init_CB(FILE *fp, int8_t flags, int8_t unit, int32_t *bufad, int16_t bufsize)
 {
         fp->_bp     = (int8_t *)0L;

libcio/fsinit.x

@@ -39 +39 @@
 extern  void            InitCH(struct channel *cp, int8_t rdi, int8_t wri, int8_t ioi, int8_t ski, chclo cfp, io_arg charg);
 extern  void            InitFS(void);
-extern  void            Init_CB(FILE *fp, int8_t unit, int8_t flags, int32_t *bufad, int16_t bufsize);
+extern  void            Init_CB(FILE *fp, int8_t flags, int8_t unit, int32_t *bufad, int16_t bufsize);
 extern  int16_t         _badfd(void);
 extern  int16_t         _noper(void);