Skip to content

Commit

Permalink
staging: tidspbridge: Remove unused defined constants
Browse files Browse the repository at this point in the history
Remove defined constants not being used.

Signed-off-by: Armando Uribe <x0095078@ti.com>
Signed-off-by: Omar Ramirez Luna <omar.ramirez@ti.com>
  • Loading branch information
Armando Uribe authored and Omar Ramirez Luna committed Feb 5, 2011
1 parent c378204 commit 2c36fac
Show file tree
Hide file tree
Showing 20 changed files with 1 addition and 161 deletions.
2 changes: 0 additions & 2 deletions drivers/staging/tidspbridge/include/dspbridge/brddefs.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@
#define BRD_IDLE 0x1 /* Monitor Loaded, but suspended. */
#define BRD_RUNNING 0x2 /* Monitor loaded, and executing. */
#define BRD_UNKNOWN 0x3 /* Board state is indeterminate. */
#define BRD_SYNCINIT 0x4
#define BRD_LOADED 0x5
#define BRD_LASTSTATE BRD_LOADED /* Set to highest legal board state. */
#define BRD_SLEEP_TRANSITION 0x6 /* Sleep transition in progress */
#define BRD_HIBERNATION 0x7 /* MPU initiated hibernation */
#define BRD_RETENTION 0x8 /* Retention mode */
Expand Down
13 changes: 0 additions & 13 deletions drivers/staging/tidspbridge/include/dspbridge/cfgdefs.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,25 +19,12 @@
#ifndef CFGDEFS_
#define CFGDEFS_

/* Maximum length of module search path. */
#define CFG_MAXSEARCHPATHLEN 255

/* Maximum length of general paths. */
#define CFG_MAXPATH 255

/* Host Resources: */
#define CFG_MAXMEMREGISTERS 9
#define CFG_MAXIOPORTS 20
#define CFG_MAXIRQS 7
#define CFG_MAXDMACHANNELS 7

/* IRQ flag */
#define CFG_IRQSHARED 0x01 /* IRQ can be shared */

/* DSP Resources: */
#define CFG_DSPMAXMEMTYPES 10
#define CFG_DEFAULT_NUM_WINDOWS 1 /* We support only one window. */

/* A platform-related device handle: */
struct cfg_devnode;

Expand Down
3 changes: 0 additions & 3 deletions drivers/staging/tidspbridge/include/dspbridge/chnldefs.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@
/* Channel id option. */
#define CHNL_PICKFREE (~0UL) /* Let manager pick a free channel. */

/* Channel manager limits: */
#define CHNL_INITIOREQS 4 /* Default # of I/O requests. */

/* Channel modes */
#define CHNL_MODETODSP 0 /* Data streaming to the DSP. */
#define CHNL_MODEFROMDSP 1 /* Data streaming from the DSP. */
Expand Down
13 changes: 0 additions & 13 deletions drivers/staging/tidspbridge/include/dspbridge/chnlpriv.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,6 @@
*/
#define CHNL_PCPY 0 /* Proc-copy transport 0 */

#define CHNL_MAXIRQ 0xff /* Arbitrarily large number. */

/* The following modes are private: */
#define CHNL_MODEUSEREVENT 0x1000 /* User provided the channel event. */
#define CHNL_MODEMASK 0x1001

/* Higher level channel states: */
#define CHNL_STATEREADY 0 /* Channel ready for I/O. */
#define CHNL_STATECANCEL 1 /* I/O was cancelled. */
Expand All @@ -56,13 +50,6 @@

/* Types of channel class libraries: */
#define CHNL_TYPESM 1 /* Shared memory driver. */
#define CHNL_TYPEBM 2 /* Bus Mastering driver. */

/* Max string length of channel I/O completion event name - change if needed */
#define CHNL_MAXEVTNAMELEN 32

/* Max memory pages lockable in CHNL_PrepareBuffer() - change if needed */
#define CHNL_MAXLOCKPAGES 64

/* Channel info. */
struct chnl_info {
Expand Down
3 changes: 0 additions & 3 deletions drivers/staging/tidspbridge/include/dspbridge/cod.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@
#define COD_TRACEBEG "SYS_PUTCBEG"
#define COD_TRACEEND "SYS_PUTCEND"
#define COD_TRACECURPOS "BRIDGE_SYS_PUTC_current"
#define COD_TRACESECT "trace"
#define COD_TRACEBEGOLD "PUTCBEG"
#define COD_TRACEENDOLD "PUTCEND"

#define COD_NOLOAD DBLL_NOLOAD
#define COD_SYMB DBLL_SYMB
Expand Down
26 changes: 0 additions & 26 deletions drivers/staging/tidspbridge/include/dspbridge/dbdefs.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@
/* API return value and calling convention */
#define DBAPI int

/* Infinite time value for the utimeout parameter to DSPStream_Select() */
#define DSP_FOREVER (-1)

/* Maximum length of node name, used in dsp_ndbprops */
#define DSP_MAXNAMELEN 32

Expand Down Expand Up @@ -74,32 +71,16 @@
#define DSP_NODE_MIN_PRIORITY 1
#define DSP_NODE_MAX_PRIORITY 15

/* Pre-Defined Message Command Codes available to user: */
#define DSP_RMSUSERCODESTART RMS_USER /* Start of RMS user cmd codes */
/* end of user codes */
#define DSP_RMSUSERCODEEND (RMS_USER + RMS_MAXUSERCODES);
/* msg_ctrl contains SM buffer description */
#define DSP_RMSBUFDESC RMS_BUFDESC

/* Shared memory identifier for MEM segment named "SHMSEG0" */
#define DSP_SHMSEG0 (u32)(-1)

/* Processor ID numbers */
#define DSP_UNIT 0
#define IVA_UNIT 1

#define DSPWORD unsigned char
#define DSPWORDSIZE sizeof(DSPWORD)

/* Power control enumerations */
#define PROC_PWRCONTROL 0x8070

#define PROC_PWRMGT_ENABLE (PROC_PWRCONTROL + 0x3)
#define PROC_PWRMGT_DISABLE (PROC_PWRCONTROL + 0x4)

/* Bridge Code Version */
#define BRIDGE_VERSION_CODE 333

#define MAX_PROFILES 16

/* DSP chip type */
Expand Down Expand Up @@ -501,13 +482,6 @@ bit 15 - Output (writeable) buffer
#define DSPPROCTYPE_C64 6410
#define IVAPROCTYPE_ARM7 470

#define REG_MGR_OBJECT 1
#define REG_DRV_OBJECT 2

/* registry */
#define DRVOBJECT "DrvObject"
#define MGROBJECT "MgrObject"

/* Max registry path length. Also the max registry value length. */
#define MAXREGPATHLENGTH 255

Expand Down
11 changes: 0 additions & 11 deletions drivers/staging/tidspbridge/include/dspbridge/dbldefs.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,6 @@
#ifndef DBLDEFS_
#define DBLDEFS_

/*
* Bit masks for dbl_flags.
*/
#define DBL_NOLOAD 0x0 /* Don't load symbols, code, or data */
#define DBL_SYMB 0x1 /* load symbols */
#define DBL_CODE 0x2 /* load code */
#define DBL_DATA 0x4 /* load data */
#define DBL_DYNAMIC 0x8 /* dynamic load */
#define DBL_BSS 0x20 /* Unitialized section */

#define DBL_MAXPATHLENGTH 255

/*
* ======== dbl_flags ========
Expand Down
1 change: 0 additions & 1 deletion drivers/staging/tidspbridge/include/dspbridge/dehdefs.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ struct deh_mgr;

/* Magic code used to determine if DSP signaled exception. */
#define DEH_BASE MBX_DEH_BASE
#define DEH_USERS_BASE MBX_DEH_USERS_BASE
#define DEH_LIMIT MBX_DEH_LIMIT

#endif /* _DEHDEFS_H */
15 changes: 0 additions & 15 deletions drivers/staging/tidspbridge/include/dspbridge/drv.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@
#include <dspbridge/drvdefs.h>
#include <linux/idr.h>

#define DRV_ASSIGN 1
#define DRV_RELEASE 0

/* Provide the DSP Internal memory windows that can be accessed from L3 address
* space */

Expand All @@ -38,23 +35,14 @@
/* MEM1 is L2 RAM + L2 Cache space */
#define OMAP_DSP_MEM1_BASE 0x5C7F8000
#define OMAP_DSP_MEM1_SIZE 0x18000
#define OMAP_DSP_GEM1_BASE 0x107F8000

/* MEM2 is L1P RAM/CACHE space */
#define OMAP_DSP_MEM2_BASE 0x5CE00000
#define OMAP_DSP_MEM2_SIZE 0x8000
#define OMAP_DSP_GEM2_BASE 0x10E00000

/* MEM3 is L1D RAM/CACHE space */
#define OMAP_DSP_MEM3_BASE 0x5CF04000
#define OMAP_DSP_MEM3_SIZE 0x14000
#define OMAP_DSP_GEM3_BASE 0x10F04000

#define OMAP_IVA2_PRM_BASE 0x48306000
#define OMAP_IVA2_PRM_SIZE 0x1000

#define OMAP_IVA2_CM_BASE 0x48004000
#define OMAP_IVA2_CM_SIZE 0x1000

#define OMAP_PER_CM_BASE 0x48005000
#define OMAP_PER_CM_SIZE 0x1000
Expand All @@ -68,9 +56,6 @@
#define OMAP_DMMU_BASE 0x5D000000
#define OMAP_DMMU_SIZE 0x1000

#define OMAP_PRCM_VDD1_DOMAIN 1
#define OMAP_PRCM_VDD2_DOMAIN 2

/* GPP PROCESS CLEANUP Data structures */

/* New structure (member of process context) abstracts NODE resource info */
Expand Down
6 changes: 0 additions & 6 deletions drivers/staging/tidspbridge/include/dspbridge/dspdefs.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,6 @@
#include <dspbridge/iodefs.h>
#include <dspbridge/msgdefs.h>

/*
* Any IOCTLS at or above this value are reserved for standard Bridge driver
* interfaces.
*/
#define BRD_RESERVEDIOCTLBASE 0x8000

/* Handle to Bridge driver's private device context. */
struct bridge_dev_context;

Expand Down
2 changes: 0 additions & 2 deletions drivers/staging/tidspbridge/include/dspbridge/dspdrv.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
#if !defined _DSPDRV_H_
#define _DSPDRV_H_

#define MAX_DEV 10 /* Max support of 10 devices */

/*
* ======== dsp_deinit ========
* Purpose:
Expand Down
5 changes: 0 additions & 5 deletions drivers/staging/tidspbridge/include/dspbridge/dspioctl.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@

#define BRDIOCTL_CHNLREAD (BRDIOCTL_RESERVEDBASE + 0x10)
#define BRDIOCTL_CHNLWRITE (BRDIOCTL_RESERVEDBASE + 0x20)
#define BRDIOCTL_GETINTRCOUNT (BRDIOCTL_RESERVEDBASE + 0x30)
#define BRDIOCTL_RESETINTRCOUNT (BRDIOCTL_RESERVEDBASE + 0x40)
#define BRDIOCTL_INTERRUPTDSP (BRDIOCTL_RESERVEDBASE + 0x50)
/* DMMU */
#define BRDIOCTL_SETMMUCONFIG (BRDIOCTL_RESERVEDBASE + 0x60)
/* PWR */
Expand All @@ -47,8 +44,6 @@
#define BRDIOCTL_DEEPSLEEP (BRDIOCTL_PWRCONTROL + 0x0)
#define BRDIOCTL_EMERGENCYSLEEP (BRDIOCTL_PWRCONTROL + 0x1)
#define BRDIOCTL_WAKEUP (BRDIOCTL_PWRCONTROL + 0x2)
#define BRDIOCTL_PWRENABLE (BRDIOCTL_PWRCONTROL + 0x3)
#define BRDIOCTL_PWRDISABLE (BRDIOCTL_PWRCONTROL + 0x4)
#define BRDIOCTL_CLK_CTRL (BRDIOCTL_PWRCONTROL + 0x7)
/* DSP Initiated Hibernate */
#define BRDIOCTL_PWR_HIBERNATE (BRDIOCTL_PWRCONTROL + 0x8)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@ struct dynamic_loader_initialize;
* Option flags to modify the behavior of module loading
*/
#define DLOAD_INITBSS 0x1 /* initialize BSS sections to zero */
#define DLOAD_BIGEND 0x2 /* require big-endian load module */
#define DLOAD_LITTLE 0x4 /* require little-endian load module */

/*****************************************************************************
* Procedure dynamic_load_module
Expand Down
1 change: 0 additions & 1 deletion drivers/staging/tidspbridge/include/dspbridge/io_sm.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
#define IO_INPUT 0
#define IO_OUTPUT 1
#define IO_SERVICE 2
#define IO_MAXSERVICE IO_SERVICE

#ifdef CONFIG_TIDSPBRIDGE_DVFS
/* The maximum number of OPPs that are supported */
Expand Down
2 changes: 0 additions & 2 deletions drivers/staging/tidspbridge/include/dspbridge/iodefs.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
#ifndef IODEFS_
#define IODEFS_

#define IO_MAXIRQ 0xff /* Arbitrarily large number. */

/* IO Objects: */
struct io_mgr;

Expand Down
40 changes: 0 additions & 40 deletions drivers/staging/tidspbridge/include/dspbridge/mbx_sh.h
Original file line number Diff line number Diff line change
Expand Up @@ -110,13 +110,7 @@
#ifndef _MBX_SH_H
#define _MBX_SH_H

#define MBX_CLASS_MSK 0xFC00 /* Class bits are 10 thru 15 */
#define MBX_VALUE_MSK 0x03FF /* Value is 0 thru 9 */

#define MBX_DEH_CLASS 0x0000 /* DEH owns Mbx INTR */
#define MBX_DDMA_CLASS 0x0400 /* DSP-DMA link drvr chnls owns INTR */
#define MBX_PCPY_CLASS 0x0800 /* PROC-COPY " */
#define MBX_ZCPY_CLASS 0x1000 /* ZERO-COPY " */
#define MBX_PM_CLASS 0x2000 /* Power Management */
#define MBX_DBG_CLASS 0x4000 /* For debugging purpose */

Expand All @@ -128,55 +122,21 @@
#define MBX_DEH_USERS_BASE 0x100 /* 256 */
#define MBX_DEH_LIMIT 0x3FF /* 1023 */
#define MBX_DEH_RESET 0x101 /* DSP RESET (DEH) */
#define MBX_DEH_EMMU 0X103 /*DSP MMU FAULT RECOVERY */

/*
* Link driver command/status codes.
*/
/* DSP-DMA */
#define MBX_DDMA_NUMCHNLBITS 5 /* # chnl Id: # bits available */
#define MBX_DDMA_CHNLSHIFT 0 /* # of bits to shift */
#define MBX_DDMA_CHNLMSK 0x01F /* bits 0 thru 4 */

#define MBX_DDMA_NUMBUFBITS 5 /* buffer index: # of bits avail */
#define MBX_DDMA_BUFSHIFT (MBX_DDMA_NUMCHNLBITS + MBX_DDMA_CHNLSHIFT)
#define MBX_DDMA_BUFMSK 0x3E0 /* bits 5 thru 9 */

/* Zero-Copy */
#define MBX_ZCPY_NUMCHNLBITS 5 /* # chnl Id: # bits available */
#define MBX_ZCPY_CHNLSHIFT 0 /* # of bits to shift */
#define MBX_ZCPY_CHNLMSK 0x01F /* bits 0 thru 4 */

/* Power Management Commands */
#define MBX_PM_DSPIDLE (MBX_PM_CLASS + 0x0)
#define MBX_PM_DSPWAKEUP (MBX_PM_CLASS + 0x1)
#define MBX_PM_EMERGENCYSLEEP (MBX_PM_CLASS + 0x2)
#define MBX_PM_SLEEPUNTILRESTART (MBX_PM_CLASS + 0x3)
#define MBX_PM_DSPGLOBALIDLE_OFF (MBX_PM_CLASS + 0x4)
#define MBX_PM_DSPGLOBALIDLE_ON (MBX_PM_CLASS + 0x5)
#define MBX_PM_SETPOINT_PRENOTIFY (MBX_PM_CLASS + 0x6)
#define MBX_PM_SETPOINT_POSTNOTIFY (MBX_PM_CLASS + 0x7)
#define MBX_PM_DSPRETN (MBX_PM_CLASS + 0x8)
#define MBX_PM_DSPRETENTION (MBX_PM_CLASS + 0x8)
#define MBX_PM_DSPHIBERNATE (MBX_PM_CLASS + 0x9)
#define MBX_PM_HIBERNATE_EN (MBX_PM_CLASS + 0xA)
#define MBX_PM_OPP_REQ (MBX_PM_CLASS + 0xB)
#define MBX_PM_OPP_CHG (MBX_PM_CLASS + 0xC)

#define MBX_PM_TYPE_MASK 0x0300
#define MBX_PM_TYPE_PWR_CHNG 0x0100
#define MBX_PM_TYPE_OPP_PRECHNG 0x0200
#define MBX_PM_TYPE_OPP_POSTCHNG 0x0300
#define MBX_PM_TYPE_OPP_MASK 0x0300
#define MBX_PM_OPP_PRECHNG (MBX_PM_CLASS | MBX_PM_TYPE_OPP_PRECHNG)
/* DSP to MPU */
#define MBX_PM_OPP_CHNG(OPP) (MBX_PM_CLASS | MBX_PM_TYPE_OPP_PRECHNG | (OPP))
#define MBX_PM_RET (MBX_PM_CLASS | MBX_PM_TYPE_PWR_CHNG | 0x0006)
#define MBX_PM_HIB (MBX_PM_CLASS | MBX_PM_TYPE_PWR_CHNG | 0x0002)
#define MBX_PM_OPP1 0
#define MBX_PM_OPP2 1
#define MBX_PM_OPP3 2
#define MBX_PM_OPP4 3

/* Bridge Debug Commands */
#define MBX_DBG_SYSPRINTF (MBX_DBG_CLASS + 0x0)
Expand Down
4 changes: 0 additions & 4 deletions drivers/staging/tidspbridge/include/dspbridge/pwr_sh.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,6 @@
/* valid sleep command codes that can be sent by GPP via mailbox: */
#define PWR_DEEPSLEEP MBX_PM_DSPIDLE
#define PWR_EMERGENCYDEEPSLEEP MBX_PM_EMERGENCYSLEEP
#define PWR_SLEEPUNTILRESTART MBX_PM_SLEEPUNTILRESTART
#define PWR_WAKEUP MBX_PM_DSPWAKEUP
#define PWR_AUTOENABLE MBX_PM_PWRENABLE
#define PWR_AUTODISABLE MBX_PM_PWRDISABLE
#define PWR_RETENTION MBX_PM_DSPRETN

#endif /* PWR_SH_ */
9 changes: 0 additions & 9 deletions drivers/staging/tidspbridge/include/dspbridge/rms_sh.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,27 +22,18 @@

#include <dspbridge/rmstypes.h>

/* Node Types: */
#define RMS_TASK 1 /* Task node */
#define RMS_DAIS 2 /* xDAIS socket node */
#define RMS_MSG 3 /* Message node */

/* Memory Types: */
#define RMS_CODE 0 /* Program space */
#define RMS_DATA 1 /* Data space */
#define RMS_IO 2 /* I/O space */

/* RM Server Command and Response Buffer Sizes: */
#define RMS_COMMANDBUFSIZE 256 /* Size of command buffer */
#define RMS_RESPONSEBUFSIZE 16 /* Size of response buffer */

/* Pre-Defined Command/Response Codes: */
#define RMS_EXIT 0x80000000 /* GPP->Node: shutdown */
#define RMS_EXITACK 0x40000000 /* Node->GPP: ack shutdown */
#define RMS_BUFDESC 0x20000000 /* Arg1 SM buf, Arg2 SM size */
#define RMS_KILLTASK 0x10000000 /* GPP->Node: Kill Task */
#define RMS_USER 0x0 /* Start of user-defined msg codes */
#define RMS_MAXUSERCODES 0xfff /* Maximum user defined C/R Codes */

/* RM Server RPC Command Structure: */
struct rms_command {
Expand Down
2 changes: 0 additions & 2 deletions drivers/staging/tidspbridge/include/dspbridge/strmdefs.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
#ifndef STRMDEFS_
#define STRMDEFS_

#define STRM_MAXEVTNAMELEN 32

struct strm_mgr;

struct strm_object;
Expand Down
Loading

0 comments on commit 2c36fac

Please sign in to comment.