djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

py: Move stream-related declarations from obj.h to stream.h.

Browse Source
This commit is contained in:
Paul Sokolovsky 2016-04-05 21:58:03 +03:00
parent e4cb7c6158
commit e6a4d4e23c
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
py/obj.h
View File

@ -444,7 +444,6 @@ bool mp_get_buffer(mp_obj_t obj, mp_buffer_info_t *bufinfo, mp_uint_t flags);
void mp_get_buffer_raise(mp_obj_t obj, mp_buffer_info_t *bufinfo, mp_uint_t flags); void mp_get_buffer_raise(mp_obj_t obj, mp_buffer_info_t *bufinfo, mp_uint_t flags);
// Stream protocol // Stream protocol
#define MP_STREAM_ERROR ((mp_uint_t)-1)
typedef struct _mp_stream_p_t { typedef struct _mp_stream_p_t {
// On error, functions should return MP_STREAM_ERROR and fill in *errcode (values // On error, functions should return MP_STREAM_ERROR and fill in *errcode (values
// are implementation-dependent, but will be exposed to user, e.g. via exception). // are implementation-dependent, but will be exposed to user, e.g. via exception).
@ -454,17 +453,6 @@ typedef struct _mp_stream_p_t {
mp_uint_t is_text : 1; // default is bytes, set this for text stream mp_uint_t is_text : 1; // default is bytes, set this for text stream
} mp_stream_p_t; } mp_stream_p_t;
// Stream ioctl request codes
#define MP_STREAM_FLUSH (1)
#define MP_STREAM_SEEK (2)
#define MP_STREAM_POLL (3)
// Argument structure for MP_STREAM_SEEK
struct mp_stream_seek_t {
mp_off_t offset;
int whence;
};
struct _mp_obj_type_t { struct _mp_obj_type_t {
mp_obj_base_t base; mp_obj_base_t base;
qstr name; qstr name;

13
py/stream.h
View File

@ -28,6 +28,19 @@
#include "py/obj.h" #include "py/obj.h"
#define MP_STREAM_ERROR ((mp_uint_t)-1)
// Stream ioctl request codes
#define MP_STREAM_FLUSH (1)
#define MP_STREAM_SEEK (2)
#define MP_STREAM_POLL (3)
// Argument structure for MP_STREAM_SEEK
struct mp_stream_seek_t {
mp_off_t offset;
int whence;
};
MP_DECLARE_CONST_FUN_OBJ(mp_stream_read_obj); MP_DECLARE_CONST_FUN_OBJ(mp_stream_read_obj);
MP_DECLARE_CONST_FUN_OBJ(mp_stream_readinto_obj); MP_DECLARE_CONST_FUN_OBJ(mp_stream_readinto_obj);
MP_DECLARE_CONST_FUN_OBJ(mp_stream_readall_obj); MP_DECLARE_CONST_FUN_OBJ(mp_stream_readall_obj);