mirror of
https://github.com/apache/nuttx.git
synced 2026-06-02 01:21:26 +08:00
Updates to STM32 OTG FS device driver
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4553 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
@@ -447,6 +447,8 @@
|
|||||||
/* Core interrupt and Interrupt mask registers */
|
/* Core interrupt and Interrupt mask registers */
|
||||||
|
|
||||||
#define OTGFS_GINTSTS_CMOD (1 << 0) /* Bit 0: Current mode of operation */
|
#define OTGFS_GINTSTS_CMOD (1 << 0) /* Bit 0: Current mode of operation */
|
||||||
|
# define OTGFS_GINTSTS_DEVMODE (0)
|
||||||
|
# define OTGFS_GINTSTS_HOSTMODE (OTGFS_GINTSTS_CMOD)
|
||||||
#define OTGFS_GINT_MMIS (1 << 1) /* Bit 1: Mode mismatch interrupt */
|
#define OTGFS_GINT_MMIS (1 << 1) /* Bit 1: Mode mismatch interrupt */
|
||||||
#define OTGFS_GINT_OTG (1 << 2) /* Bit 2: OTG interrupt */
|
#define OTGFS_GINT_OTG (1 << 2) /* Bit 2: OTG interrupt */
|
||||||
#define OTGFS_GINT_SOF (1 << 3) /* Bit 3: Start of frame */
|
#define OTGFS_GINT_SOF (1 << 3) /* Bit 3: Start of frame */
|
||||||
@@ -785,8 +787,12 @@
|
|||||||
/* Bits 5-31: Reserved, must be kept at reset value */
|
/* Bits 5-31: Reserved, must be kept at reset value */
|
||||||
/* Device all endpoints interrupt and All endpoints interrupt mask registers */
|
/* Device all endpoints interrupt and All endpoints interrupt mask registers */
|
||||||
|
|
||||||
#define OTGFS_DAINT_IEP(n) (1 << (n)) /* Bits 0-15: IN endpoint interrupt bits */
|
#define OTGFS_DAINT_IEP_SHIFT (0) /* Bits 0-15: IN endpoint interrupt bits */
|
||||||
#define OTGFS_DAINT_OEP(n) (1 << ((n)+16)) /* Bits 16-31: OUT endpoint interrupt bits */
|
#define OTGFS_DAINT_IEP_MASK (0xffff << OTGFS_DAINT_IEP_SHIFT)
|
||||||
|
# define OTGFS_DAINT_IEP(n) (1 << (n))
|
||||||
|
#define OTGFS_DAINT_OEP_SHIFT (16) /* Bits 16-31: OUT endpoint interrupt bits */
|
||||||
|
#define OTGFS_DAINT_OEP_MASK (0xffff << OTGFS_DAINT_OEP_SHIFT)
|
||||||
|
# define OTGFS_DAINT_OEP(n) (1 << ((n)+16))
|
||||||
|
|
||||||
/* Device VBUS discharge time register */
|
/* Device VBUS discharge time register */
|
||||||
|
|
||||||
|
|||||||
+731
-501
File diff suppressed because it is too large
Load Diff
@@ -1,8 +1,8 @@
|
|||||||
############################################################################
|
############################################################################
|
||||||
# lib/stdlib/Make.defs
|
# lib/stdlib/Make.defs
|
||||||
#
|
#
|
||||||
# Copyright (C) 2011 Gregory Nutt. All rights reserved.
|
# Copyright (C) 2012 Gregory Nutt. All rights reserved.
|
||||||
# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
|
# Author: Gregory Nutt <gnutt@nuttx.org>
|
||||||
#
|
#
|
||||||
# Redistribution and use in source and binary forms, with or without
|
# Redistribution and use in source and binary forms, with or without
|
||||||
# modification, are permitted provided that the following conditions
|
# modification, are permitted provided that the following conditions
|
||||||
|
|||||||
+48
-8
@@ -1,8 +1,8 @@
|
|||||||
/************************************************************************
|
/************************************************************************
|
||||||
* lib/stdlib/abort.c
|
* lib/stdlib/lib_abort.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
|
* Copyright (C) 2007, 2009, 2011-2012 Gregory Nutt. All rights reserved.
|
||||||
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
|
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
* modification, are permitted provided that the following conditions
|
* modification, are permitted provided that the following conditions
|
||||||
@@ -37,10 +37,13 @@
|
|||||||
* Included Files
|
* Included Files
|
||||||
************************************************************************/
|
************************************************************************/
|
||||||
|
|
||||||
|
#include <nuttx/config.h>
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
#include <pthread.h>
|
||||||
|
|
||||||
/************************************************************************
|
/************************************************************************
|
||||||
* Definitions
|
* Pre-processor Definitions
|
||||||
************************************************************************/
|
************************************************************************/
|
||||||
|
|
||||||
/************************************************************************
|
/************************************************************************
|
||||||
@@ -60,7 +63,7 @@
|
|||||||
************************************************************************/
|
************************************************************************/
|
||||||
|
|
||||||
/************************************************************************
|
/************************************************************************
|
||||||
* Private Functionss
|
* Private Functions
|
||||||
************************************************************************/
|
************************************************************************/
|
||||||
|
|
||||||
/************************************************************************
|
/************************************************************************
|
||||||
@@ -68,14 +71,51 @@
|
|||||||
************************************************************************/
|
************************************************************************/
|
||||||
|
|
||||||
/************************************************************************
|
/************************************************************************
|
||||||
* Function: abort
|
* Name: Abort
|
||||||
*
|
*
|
||||||
* Description:
|
* Description:
|
||||||
* The abort() function causes abnormal program termination.
|
* The abort() first unblocks the SIGABRT signal, and then raises that
|
||||||
* All open streams are closed and flushed.
|
* signal for the calling process. This results in the abnormal
|
||||||
|
* termination of the process unless the SIGABRT signal is caught and
|
||||||
|
* the signal handler does not return.
|
||||||
|
*
|
||||||
|
* If the abort() function causes process termination, all open
|
||||||
|
* streams are closed and flushed.
|
||||||
|
*
|
||||||
|
* If the SIGABRT signal is ignored, or caught by a handler that
|
||||||
|
* returns, the abort() function will still terminate the process.
|
||||||
|
* It does this by restoring the default disposition for SIGABRT and
|
||||||
|
* then raising the signal for a second time.
|
||||||
|
*
|
||||||
|
* Input parameters:
|
||||||
|
* None
|
||||||
|
*
|
||||||
|
* Returned Value:
|
||||||
|
* This function does not return,
|
||||||
|
*
|
||||||
************************************************************************/
|
************************************************************************/
|
||||||
|
|
||||||
void abort(void)
|
void abort(void)
|
||||||
{
|
{
|
||||||
|
/* NuttX does not support standard signal functionality (like the
|
||||||
|
* behavior of the SIGABRT signal). So no attempt is made to provide
|
||||||
|
* a conformant version of abort() at this time. This version does not
|
||||||
|
* signal the calling thread all.
|
||||||
|
*
|
||||||
|
* Note that pthread_exit() is called instead of exit(). That is because
|
||||||
|
* we do no know if abort was called from a pthread or a normal thread
|
||||||
|
* (we could find out, of course). If abort() is called from a non-pthread,
|
||||||
|
* then pthread_exit() should fail and fall back to call exit() anyway.
|
||||||
|
*
|
||||||
|
* If exit() is called (either below or via pthread_exit()), then exit()
|
||||||
|
* will flush and close all open files and terminate the thread. If this
|
||||||
|
* function was called from a pthread, then pthread_exit() will complete
|
||||||
|
* any joins, but will not flush or close any streams.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifdef CONFIG_DISABLE_PTHREAD
|
||||||
exit(EXIT_FAILURE);
|
exit(EXIT_FAILURE);
|
||||||
|
#else
|
||||||
|
pthread_exit(NULL);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user