Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d4740c8 authored by Stefan Haberland's avatar Stefan Haberland Committed by Martin Schwidefsky
Browse files

[S390] sclp: fix coding style. 



Use only capital letters for defines.

Cc: Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
Signed-off-by: default avatarStefan Haberland <stefan.haberland@de.ibm.com>
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 66b494a7

drivers/s390/char/sclp.c

+1 −1
Original line number Diff line number Diff line
@@ -511,7 +511,7 @@ sclp_state_change_cb(struct evbuf_header *evbuf) 
}



static struct sclp_register sclp_state_change_event = {

	.receive_mask = EvTyp_StateChange_Mask,

	.receive_mask = EVTYP_STATECHANGE_MASK,

	.receiver_fn = sclp_state_change_cb

};

drivers/s390/char/sclp.h

+36 −36
Original line number Diff line number Diff line
@@ -19,35 +19,35 @@ 
#define MAX_KMEM_PAGES (sizeof(unsigned long) << 3)

#define MAX_CONSOLE_PAGES	4



#define EvTyp_OpCmd		0x01

#define EvTyp_Msg		0x02

#define EvTyp_StateChange	0x08

#define EvTyp_PMsgCmd		0x09

#define EvTyp_CntlProgOpCmd	0x20

#define EvTyp_CntlProgIdent	0x0B

#define EvTyp_SigQuiesce	0x1D

#define EvTyp_VT220Msg		0x1A

#define EvTyp_SDIAS		0x1C



#define EvTyp_OpCmd_Mask	0x80000000

#define EvTyp_Msg_Mask		0x40000000

#define EvTyp_StateChange_Mask	0x01000000

#define EvTyp_PMsgCmd_Mask	0x00800000

#define EvTyp_CtlProgOpCmd_Mask	0x00000001

#define EvTyp_CtlProgIdent_Mask	0x00200000

#define EvTyp_SigQuiesce_Mask	0x00000008

#define EvTyp_VT220Msg_Mask	0x00000040

#define EvTyp_SDIAS_Mask	0x00000010



#define GnrlMsgFlgs_DOM		0x8000

#define GnrlMsgFlgs_SndAlrm	0x4000

#define GnrlMsgFlgs_HoldMsg	0x2000



#define LnTpFlgs_CntlText	0x8000

#define LnTpFlgs_LabelText	0x4000

#define LnTpFlgs_DataText	0x2000

#define LnTpFlgs_EndText	0x1000

#define LnTpFlgs_PromptText	0x0800

#define EVTYP_OPCMD		0x01

#define EVTYP_MSG		0x02

#define EVTYP_STATECHANGE	0x08

#define EVTYP_PMSGCMD		0x09

#define EVTYP_CNTLPROGOPCMD	0x20

#define EVTYP_CNTLPROGIDENT	0x0B

#define EVTYP_SIGQUIESCE	0x1D

#define EVTYP_VT220MSG		0x1A

#define EVTYP_SDIAS		0x1C



#define EVTYP_OPCMD_MASK	0x80000000

#define EVTYP_MSG_MASK		0x40000000

#define EVTYP_STATECHANGE_MASK	0x01000000

#define EVTYP_PMSGCMD_MASK	0x00800000

#define EVTYP_CTLPROGOPCMD_MASK	0x00000001

#define EVTYP_CTLPROGIDENT_MASK	0x00200000

#define EVTYP_SIGQUIESCE_MASK	0x00000008

#define EVTYP_VT220MSG_MASK	0x00000040

#define EVTYP_SDIAS_MASK	0x00000010



#define GNRLMSGFLGS_DOM		0x8000

#define GNRLMSGFLGS_SNDALRM	0x4000

#define GNRLMSGFLGS_HOLDMSG	0x2000



#define LNTPFLGS_CNTLTEXT	0x8000

#define LNTPFLGS_LABELTEXT	0x4000

#define LNTPFLGS_DATATEXT	0x2000

#define LNTPFLGS_ENDTEXT	0x1000

#define LNTPFLGS_PROMPTTEXT	0x0800



typedef unsigned int sclp_cmdw_t;
@@ -58,15 +58,15 @@ typedef unsigned int sclp_cmdw_t; 
#define SCLP_CMDW_READ_SCP_INFO_FORCED	0x00120001



#define GDS_ID_MDSMU		0x1310

#define GDS_ID_MDSRouteInfo	0x1311

#define GDS_ID_AgUnWrkCorr	0x1549

#define GDS_ID_SNACondReport	0x1532

#define GDS_ID_MDSROUTEINFO	0x1311

#define GDS_ID_AGUNWRKCORR	0x1549

#define GDS_ID_SNACONDREPORT	0x1532

#define GDS_ID_CPMSU		0x1212

#define GDS_ID_RoutTargInstr	0x154D

#define GDS_ID_OpReq		0x8070

#define GDS_ID_TextCmd		0x1320

#define GDS_ID_ROUTTARGINSTR	0x154D

#define GDS_ID_OPREQ		0x8070

#define GDS_ID_TEXTCMD		0x1320



#define GDS_KEY_SelfDefTextMsg	0x31

#define GDS_KEY_SELFDEFTEXTMSG	0x31



typedef u32 sccb_mask_t;	/* ATTENTION: assumes 32bit mask !!! */

drivers/s390/char/sclp_cpi.c

+2 −2
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ struct cpi_sccb { 
/* Event type structure for write message and write priority message */

static struct sclp_register sclp_cpi_event =

{

	.send_mask = EvTyp_CtlProgIdent_Mask

	.send_mask = EVTYP_CTLPROGIDENT_MASK

};



MODULE_LICENSE("GPL");
@@ -201,7 +201,7 @@ cpi_module_init(void) 
		       "console.\n");

		return -EINVAL;

	}

	if (!(sclp_cpi_event.sclp_send_mask & EvTyp_CtlProgIdent_Mask)) {

	if (!(sclp_cpi_event.sclp_send_mask & EVTYP_CTLPROGIDENT_MASK)) {

		printk(KERN_WARNING "cpi: no control program identification "

		       "support\n");

		sclp_unregister(&sclp_cpi_event);

drivers/s390/char/sclp_quiesce.c

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ sclp_quiesce_handler(struct evbuf_header *evbuf) 
}



static struct sclp_register sclp_quiesce_event = {

	.receive_mask = EvTyp_SigQuiesce_Mask,

	.receive_mask = EVTYP_SIGQUIESCE_MASK,

	.receiver_fn = sclp_quiesce_handler

};

drivers/s390/char/sclp_rw.c

+8 −8
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 


/* Event type structure for write message and write priority message */

static struct sclp_register sclp_rw_event = {

	.send_mask = EvTyp_Msg_Mask | EvTyp_PMsgCmd_Mask

	.send_mask = EVTYP_MSG_MASK | EVTYP_PMSGCMD_MASK

};



/*
@@ -64,7 +64,7 @@ sclp_make_buffer(void *page, unsigned short columns, unsigned short htab) 
	memset(sccb, 0, sizeof(struct write_sccb));

	sccb->header.length = sizeof(struct write_sccb);

	sccb->msg_buf.header.length = sizeof(struct msg_buf);

	sccb->msg_buf.header.type = EvTyp_Msg;

	sccb->msg_buf.header.type = EVTYP_MSG;

	sccb->msg_buf.mdb.header.length = sizeof(struct mdb);

	sccb->msg_buf.mdb.header.type = 1;

	sccb->msg_buf.mdb.header.tag = 0xD4C4C240;	/* ebcdic "MDB " */
@@ -114,7 +114,7 @@ sclp_initialize_mto(struct sclp_buffer *buffer, int max_len) 
	memset(mto, 0, sizeof(struct mto));

	mto->length = sizeof(struct mto);

	mto->type = 4;	/* message text object */

	mto->line_type_flags = LnTpFlgs_EndText; /* end text */

	mto->line_type_flags = LNTPFLGS_ENDTEXT; /* end text */



	/* set pointer to first byte after struct mto. */

	buffer->current_line = (char *) (mto + 1);
@@ -215,7 +215,7 @@ sclp_write(struct sclp_buffer *buffer, const unsigned char *msg, int count) 
		case '\a':	/* bell, one for several times	*/

			/* set SCLP sound alarm bit in General Object */

			buffer->sccb->msg_buf.mdb.go.general_msg_flags |=

				GnrlMsgFlgs_SndAlrm;

				GNRLMSGFLGS_SNDALRM;

			break;

		case '\t':	/* horizontal tabulator	 */

			/* check if new mto needs to be created */
@@ -452,12 +452,12 @@ sclp_emit_buffer(struct sclp_buffer *buffer, 
		return -EIO;



	sccb = buffer->sccb;

	if (sclp_rw_event.sclp_send_mask & EvTyp_Msg_Mask)

	if (sclp_rw_event.sclp_send_mask & EVTYP_MSG_MASK)

		/* Use normal write message */

		sccb->msg_buf.header.type = EvTyp_Msg;

	else if (sclp_rw_event.sclp_send_mask & EvTyp_PMsgCmd_Mask)

		sccb->msg_buf.header.type = EVTYP_MSG;

	else if (sclp_rw_event.sclp_send_mask & EVTYP_PMSGCMD_MASK)

		/* Use write priority message */

		sccb->msg_buf.header.type = EvTyp_PMsgCmd;

		sccb->msg_buf.header.type = EVTYP_PMSGCMD;

	else

		return -ENOSYS;

	buffer->request.command = SCLP_CMDW_WRITE_EVENT_DATA;