laiyp/lib_xua
1
0
Fork 0
forked from PAWPAW-Mirror/lib_xua
Code Pull Requests Activity

Merge remote-tracking branch 'upstream/develop' into feature/bringup_316

Browse Source
This commit is contained in:
xross
2022-07-11 12:06:40 +01:00
parent 5441081927 d6abd5d159
commit 0659b1c536
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -23,6 +23,7 @@ _build*
**/.vscode/** **/.vscode/**
**.egg-info **.egg-info
*.pdf *.pdf
*tests/logs/*
# waf build files # waf build files
.lock-waf_* .lock-waf_*

2
lib_xua/api/xua_buffer.h
View File

@@ -1,4 +1,4 @@
// Copyright 2011-2021 XMOS LIMITED. // Copyright 2011-2022 XMOS LIMITED.
// This Software is subject to the terms of the XMOS Public Licence: Version 1. // This Software is subject to the terms of the XMOS Public Licence: Version 1.
#ifndef __XUA_BUFFER_H__ #ifndef __XUA_BUFFER_H__
#define __XUA_BUFFER_H__ #define __XUA_BUFFER_H__

7
lib_xua/src/core/endpoint0/xua_ep0_descriptors.h
View File

@@ -10,12 +10,13 @@
#define _DEVICE_DESCRIPTORS_ #define _DEVICE_DESCRIPTORS_
#include <stddef.h> #include <stddef.h>
#include "xua.h" /* Device specific define */ #include "xua.h" /* Device specific define */
#include "descriptor_defs.h" #include "descriptor_defs.h"
#include "usbaudio20.h" /* Defines from the USB Audio 2.0 Specifications */ #include "usbaudio20.h" /* Defines from the USB Audio 2.0 Specifications */
#include "usbaudiocommon.h" #include "usbaudiocommon.h"
#include "xud_device.h" #include "xud_device.h"
#include "xua_hid_descriptor.h" #include "xua_hid_descriptor.h"
#include "xud.h"
#define APPEND_VENDOR_STR(x) VENDOR_STR" "#x #define APPEND_VENDOR_STR(x) VENDOR_STR" "#x
@@ -2682,7 +2683,7 @@ unsigned char cfgDesc_Audio1[] =
#elif (XUA_SYNCMODE == XUA_SYNCMODE_SYNC) #elif (XUA_SYNCMODE == XUA_SYNCMODE_SYNC)
ISO_EP_ATTRIBUTES_SYNC, /* Iso, sync, data endpoint */ ISO_EP_ATTRIBUTES_SYNC, /* Iso, sync, data endpoint */
#else #else
#error "Bad XUD_SYNCMODE" #error "Unsupported XUA_SYNCMODE"
#endif #endif
(FS_STREAM_FORMAT_OUTPUT_1_MAXPACKETSIZE&0xff), /* 4 wMaxPacketSize (Typically 294 bytes)*/ (FS_STREAM_FORMAT_OUTPUT_1_MAXPACKETSIZE&0xff), /* 4 wMaxPacketSize (Typically 294 bytes)*/
(FS_STREAM_FORMAT_OUTPUT_1_MAXPACKETSIZE&0xff00)>>8, /* 5 wMaxPacketSize */ (FS_STREAM_FORMAT_OUTPUT_1_MAXPACKETSIZE&0xff00)>>8, /* 5 wMaxPacketSize */
@@ -2830,7 +2831,7 @@ unsigned char cfgDesc_Audio1[] =
#elif (XUA_SYNCMODE == XUA_SYNCMODE_SYNC) #elif (XUA_SYNCMODE == XUA_SYNCMODE_SYNC)
ISO_EP_ATTRIBUTES_SYNC, /* Iso, sync, data endpoint */ ISO_EP_ATTRIBUTES_SYNC, /* Iso, sync, data endpoint */
#else #else
#error "Bad XUD_SYNCMODE" #error "Unsupported XUA_SYNCMODE"
#endif #endif
FS_STREAM_FORMAT_INPUT_1_MAXPACKETSIZE&0xff, /* 4 wMaxPacketSize (Typically 294 bytes)*/ FS_STREAM_FORMAT_INPUT_1_MAXPACKETSIZE&0xff, /* 4 wMaxPacketSize (Typically 294 bytes)*/
(FS_STREAM_FORMAT_INPUT_1_MAXPACKETSIZE&0xff00)>>8, /* 5 wMaxPacketSize */ (FS_STREAM_FORMAT_INPUT_1_MAXPACKETSIZE&0xff00)>>8, /* 5 wMaxPacketSize */