WebSVN – HelenOS – Diff – /branches/dynload/uspace/srv/kbd/generic/kbd.c


/*
 * Copyright (c) 2006 Josef Cejka
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * - Redistributions of source code must retain the above copyright
 *   notice, this list of conditions and the following disclaimer.
 * - Redistributions in binary form must reproduce the above copyright
 *   notice, this list of conditions and the following disclaimer in the
 *   documentation and/or other materials provided with the distribution.
 * - The name of the author may not be used to endorse or promote products
 *   derived from this software without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
/**
 * @addtogroup kbdgen generic
 * @brief   HelenOS generic uspace keyboard handler.
 * @ingroup  kbd
 * @{
 */
/** @file
 */
 
#include <ipc/ipc.h>
#include <ipc/services.h>
#include <sysinfo.h>
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
#include <ipc/ns.h>
#include <async.h>
#include <errno.h>
#include <libadt/fifo.h>
#include <kbd/kbd.h>
#include <kbd/keycode.h>
 
#include <kbd.h>
#include <key_buffer.h>
#include <kbd_port.h>
#include <kbd_ctl.h>
#include <layout.h>
 
#define NAME "kbd"
 
int cons_connected = 0;
int phone2cons = -1;
keybuffer_t keybuffer;
 
/** Currently active modifiers. */
static unsigned mods = KM_NUM_LOCK;
 
/** Currently pressed lock keys. We track these to tackle autorepeat. */
static unsigned lock_keys;
 
int cir_service = 0;
int cir_phone = -1;
 
#define NUM_LAYOUTS 3
 
static layout_op_t *layout[NUM_LAYOUTS] = {
    &us_qwerty_op,
    &us_dvorak_op,
    &cz_op
};
 
static int active_layout = 0;
 
void kbd_push_scancode(int scancode)
{
/*  printf("scancode: 0x%x\n", scancode);*/
    kbd_ctl_parse_scancode(scancode);
}
 
void kbd_push_ev(int type, unsigned int key)
{
    kbd_event_t ev;
    unsigned mod_mask;
 
    switch (key) {
    case KC_LCTRL: mod_mask = KM_LCTRL; break;
    case KC_RCTRL: mod_mask = KM_RCTRL; break;
    case KC_LSHIFT: mod_mask = KM_LSHIFT; break;
    case KC_RSHIFT: mod_mask = KM_RSHIFT; break;
    case KC_LALT: mod_mask = KM_LALT; break;
    case KC_RALT: mod_mask = KM_RALT; break;
    default: mod_mask = 0; break;
    }
 
    if (mod_mask != 0) {
        if (type == KE_PRESS)
            mods = mods | mod_mask;
        else
            mods = mods & ~mod_mask;
    }
 
    switch (key) {
    case KC_CAPS_LOCK: mod_mask = KM_CAPS_LOCK; break;
    case KC_NUM_LOCK: mod_mask = KM_NUM_LOCK; break;
    case KC_SCROLL_LOCK: mod_mask = KM_SCROLL_LOCK; break;
    default: mod_mask = 0; break;
    }
 
    if (mod_mask != 0) {
        if (type == KE_PRESS) {
            /*
             * Only change lock state on transition from released
             * to pressed. This prevents autorepeat from messing
             * up the lock state.
             */
            mods = mods ^ (mod_mask & ~lock_keys);
            lock_keys = lock_keys | mod_mask;
        } else {
            lock_keys = lock_keys & ~mod_mask;
        }
    }
/*
    printf("type: %d\n", type);
    printf("mods: 0x%x\n", mods);
    printf("keycode: %u\n", key);
*/
    if (type == KE_PRESS && (mods & KM_LCTRL) &&
        key == KC_F1) {
        active_layout = 0;
        layout[active_layout]->reset();
        return;
    }
 
    if (type == KE_PRESS && (mods & KM_LCTRL) &&
        key == KC_F2) {
        active_layout = 1;
        layout[active_layout]->reset();
        return;
    }
 
    if (type == KE_PRESS && (mods & KM_LCTRL) &&
        key == KC_F3) {
        active_layout = 2;
        layout[active_layout]->reset();
        return;
    }
 
    ev.type = type;
    ev.key = key;
    ev.mods = mods;
 
    ev.c = layout[active_layout]->parse_ev(&ev);
 
    async_msg_4(phone2cons, KBD_EVENT, ev.type, ev.key, ev.mods, ev.c);
}
 
static void console_connection(ipc_callid_t iid, ipc_call_t *icall)
{
    ipc_callid_t callid;
    ipc_call_t call;
    int retval;
 
    if (cons_connected) {
        ipc_answer_0(iid, ELIMIT);
        return;
    }
    cons_connected = 1;
    ipc_answer_0(iid, EOK);
 
    while (1) {
        callid = async_get_call(&call);
        switch (IPC_GET_METHOD(call)) {
        case IPC_M_PHONE_HUNGUP:
            cons_connected = 0;
            ipc_hangup(phone2cons);
            phone2cons = -1;
            ipc_answer_0(callid, EOK);
            return;
        case IPC_M_CONNECT_TO_ME:
            if (phone2cons != -1) {
                retval = ELIMIT;
                break;
            }
            phone2cons = IPC_GET_ARG5(call);
            retval = 0;
            break;
        case KBD_YIELD:
            kbd_port_yield();
            retval = 0;
            break;
        case KBD_RECLAIM:
            kbd_port_reclaim();
            retval = 0;
            break;
        default:
            retval = EINVAL;
        }
        ipc_answer_0(callid, retval);
    }  
}
 
 
int main(int argc, char **argv)
{
    printf(NAME ": HelenOS Keyboard service\n");
   
    ipcarg_t phonead;
   
    if (sysinfo_value("kbd.cir.fhc") == 1)
        cir_service = SERVICE_FHC;
    else if (sysinfo_value("kbd.cir.obio") == 1)
        cir_service = SERVICE_OBIO;
   
    if (cir_service) {
        while (cir_phone < 0) {
            cir_phone = ipc_connect_me_to_blocking(PHONE_NS, cir_service,
                0, 0);
        }
    }
   
    /* Initialize port driver. */
    if (kbd_port_init() != 0)
        return -1;
 
    /* Initialize controller driver. */
    if (kbd_ctl_init() != 0)
        return -1;
 
    /* Initialize (reset) layout. */
    layout[active_layout]->reset();
   
    /* Initialize key buffer */
    keybuffer_init(&keybuffer);
   
    async_set_client_connection(console_connection);
 
    /* Register service at nameserver. */
    if (ipc_connect_to_me(PHONE_NS, SERVICE_KEYBOARD, 0, 0, &phonead) != 0)
        return -1;
   
    printf(NAME ": Accepting connections\n");
    async_manager();
 
    /* Not reached. */
    return 0;
}
 
/**
 * @}
 */
 

Rev 4346	Rev 4348
1	/*	1	/*
2	* Copyright (c) 2006 Josef Cejka	2	* Copyright (c) 2006 Josef Cejka
3	* All rights reserved.	3	* All rights reserved.
4	*	4	*
5	* Redistribution and use in source and binary forms, with or without	5	* Redistribution and use in source and binary forms, with or without
6	* modification, are permitted provided that the following conditions	6	* modification, are permitted provided that the following conditions
7	* are met:	7	* are met:
8	*	8	*
9	* - Redistributions of source code must retain the above copyright	9	* - Redistributions of source code must retain the above copyright
10	* notice, this list of conditions and the following disclaimer.	10	* notice, this list of conditions and the following disclaimer.
11	* - Redistributions in binary form must reproduce the above copyright	11	* - Redistributions in binary form must reproduce the above copyright
12	* notice, this list of conditions and the following disclaimer in the	12	* notice, this list of conditions and the following disclaimer in the
13	* documentation and/or other materials provided with the distribution.	13	* documentation and/or other materials provided with the distribution.
14	* - The name of the author may not be used to endorse or promote products	14	* - The name of the author may not be used to endorse or promote products
15	* derived from this software without specific prior written permission.	15	* derived from this software without specific prior written permission.
16	*	16	*
17	* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR	17	* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
18	* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES	18	* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
19	* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.	19	* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
20	* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,	20	* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
21	* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT	21	* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
22	* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,	22	* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
23	* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY	23	* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
24	* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT	24	* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF	25	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26	* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	26	* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27	*/	27	*/
28		28
29	/**	29	/**
30	* @addtogroup kbdgen generic	30	* @addtogroup kbdgen generic
31	* @brief HelenOS generic uspace keyboard handler.	31	* @brief HelenOS generic uspace keyboard handler.
32	* @ingroup kbd	32	* @ingroup kbd
33	* @{	33	* @{
34	*/	34	*/
35	/** @file	35	/** @file
36	*/	36	*/
37		37
38	#include <ipc/ipc.h>	38	#include <ipc/ipc.h>
39	#include <ipc/services.h>	39	#include <ipc/services.h>
40	#include <sysinfo.h>	40	#include <sysinfo.h>
41	#include <stdio.h>	41	#include <stdio.h>
42	#include <unistd.h>	42	#include <unistd.h>
43	#include <stdlib.h>	43	#include <stdlib.h>
44	#include <stdio.h>	44	#include <stdio.h>
45	#include <ipc/ns.h>	45	#include <ipc/ns.h>
46	#include <async.h>	46	#include <async.h>
47	#include <errno.h>	47	#include <errno.h>
48	#include <libadt/fifo.h>	48	#include <libadt/fifo.h>
49	#include <kbd/kbd.h>	49	#include <kbd/kbd.h>
50	#include <kbd/keycode.h>	50	#include <kbd/keycode.h>
51		51
52	#include <kbd.h>	52	#include <kbd.h>
53	#include <key_buffer.h>	53	#include <key_buffer.h>
54	#include <kbd_port.h>	54	#include <kbd_port.h>
55	#include <kbd_ctl.h>	55	#include <kbd_ctl.h>
56	#include <layout.h>	56	#include <layout.h>
57		57
58	#define NAME "kbd"	58	#define NAME "kbd"
59		59
60	int cons_connected = 0;	60	int cons_connected = 0;
61	int phone2cons = -1;	61	int phone2cons = -1;
62	keybuffer_t keybuffer;	62	keybuffer_t keybuffer;
63		63
64	/** Currently active modifiers. */	64	/** Currently active modifiers. */
65	static unsigned mods = KM_NUM_LOCK;	65	static unsigned mods = KM_NUM_LOCK;
66		66
67	/** Currently pressed lock keys. We track these to tackle autorepeat. */	67	/** Currently pressed lock keys. We track these to tackle autorepeat. */
68	static unsigned lock_keys;	68	static unsigned lock_keys;
69		69
70	int cir_service = 0;	70	int cir_service = 0;
71	int cir_phone = -1;	71	int cir_phone = -1;
72		72
-		73	#define NUM_LAYOUTS 3
-		74
-		75	static layout_op_t *layout[NUM_LAYOUTS] = {
-		76	&us_qwerty_op,
-		77	&us_dvorak_op,
-		78	&cz_op
-		79	};
-		80
-		81	static int active_layout = 0;
-		82
73	void kbd_push_scancode(int scancode)	83	void kbd_push_scancode(int scancode)
74	{	84	{
75	/* printf("scancode: 0x%x\n", scancode);*/	85	/* printf("scancode: 0x%x\n", scancode);*/
76	kbd_ctl_parse_scancode(scancode);	86	kbd_ctl_parse_scancode(scancode);
77	}	87	}
78		88
79	void kbd_push_ev(int type, unsigned int key)	89	void kbd_push_ev(int type, unsigned int key)
80	{	90	{
81	kbd_event_t ev;	91	kbd_event_t ev;
82	unsigned mod_mask;	92	unsigned mod_mask;
83		93
84	switch (key) {	94	switch (key) {
85	case KC_LCTRL: mod_mask = KM_LCTRL; break;	95	case KC_LCTRL: mod_mask = KM_LCTRL; break;
86	case KC_RCTRL: mod_mask = KM_RCTRL; break;	96	case KC_RCTRL: mod_mask = KM_RCTRL; break;
87	case KC_LSHIFT: mod_mask = KM_LSHIFT; break;	97	case KC_LSHIFT: mod_mask = KM_LSHIFT; break;
88	case KC_RSHIFT: mod_mask = KM_RSHIFT; break;	98	case KC_RSHIFT: mod_mask = KM_RSHIFT; break;
89	case KC_LALT: mod_mask = KM_LALT; break;	99	case KC_LALT: mod_mask = KM_LALT; break;
90	case KC_RALT: mod_mask = KM_RALT; break;	100	case KC_RALT: mod_mask = KM_RALT; break;
91	default: mod_mask = 0; break;	101	default: mod_mask = 0; break;
92	}	102	}
93		103
94	if (mod_mask != 0) {	104	if (mod_mask != 0) {
95	if (type == KE_PRESS)	105	if (type == KE_PRESS)
96	mods = mods \| mod_mask;	106	mods = mods \| mod_mask;
97	else	107	else
98	mods = mods & ~mod_mask;	108	mods = mods & ~mod_mask;
99	}	109	}
100		110
101	switch (key) {	111	switch (key) {
102	case KC_CAPS_LOCK: mod_mask = KM_CAPS_LOCK; break;	112	case KC_CAPS_LOCK: mod_mask = KM_CAPS_LOCK; break;
103	case KC_NUM_LOCK: mod_mask = KM_NUM_LOCK; break;	113	case KC_NUM_LOCK: mod_mask = KM_NUM_LOCK; break;
104	case KC_SCROLL_LOCK: mod_mask = KM_SCROLL_LOCK; break;	114	case KC_SCROLL_LOCK: mod_mask = KM_SCROLL_LOCK; break;
105	default: mod_mask = 0; break;	115	default: mod_mask = 0; break;
106	}	116	}
107		117
108	if (mod_mask != 0) {	118	if (mod_mask != 0) {
109	if (type == KE_PRESS) {	119	if (type == KE_PRESS) {
110	/*	120	/*
111	* Only change lock state on transition from released	121	* Only change lock state on transition from released
112	* to pressed. This prevents autorepeat from messing	122	* to pressed. This prevents autorepeat from messing
113	* up the lock state.	123	* up the lock state.
114	*/	124	*/
115	mods = mods ^ (mod_mask & ~lock_keys);	125	mods = mods ^ (mod_mask & ~lock_keys);
116	lock_keys = lock_keys \| mod_mask;	126	lock_keys = lock_keys \| mod_mask;
117	} else {	127	} else {
118	lock_keys = lock_keys & ~mod_mask;	128	lock_keys = lock_keys & ~mod_mask;
119	}	129	}
120	}	130	}
121	/*	131	/*
122	printf("type: %d\n", type);	132	printf("type: %d\n", type);
123	printf("mods: 0x%x\n", mods);	133	printf("mods: 0x%x\n", mods);
124	printf("keycode: %u\n", key);	134	printf("keycode: %u\n", key);
125	*/	135	*/
-		136	if (type == KE_PRESS && (mods & KM_LCTRL) &&
-		137	key == KC_F1) {
-		138	active_layout = 0;
-		139	layout[active_layout]->reset();
-		140	return;
-		141	}
-		142
-		143	if (type == KE_PRESS && (mods & KM_LCTRL) &&
-		144	key == KC_F2) {
-		145	active_layout = 1;
-		146	layout[active_layout]->reset();
-		147	return;
-		148	}
-		149
-		150	if (type == KE_PRESS && (mods & KM_LCTRL) &&
-		151	key == KC_F3) {
-		152	active_layout = 2;
-		153	layout[active_layout]->reset();
-		154	return;
-		155	}
-		156
126	ev.type = type;	157	ev.type = type;
127	ev.key = key;	158	ev.key = key;
128	ev.mods = mods;	159	ev.mods = mods;
129		160
130	ev.c = layout_parse_ev(&ev);	161	ev.c = layout[active_layout]->parse_ev(&ev);
131		162
132	async_msg_4(phone2cons, KBD_EVENT, ev.type, ev.key, ev.mods, ev.c);	163	async_msg_4(phone2cons, KBD_EVENT, ev.type, ev.key, ev.mods, ev.c);
133	}	164	}
134		165
135	static void console_connection(ipc_callid_t iid, ipc_call_t *icall)	166	static void console_connection(ipc_callid_t iid, ipc_call_t *icall)
136	{	167	{
137	ipc_callid_t callid;	168	ipc_callid_t callid;
138	ipc_call_t call;	169	ipc_call_t call;
139	int retval;	170	int retval;
140		171
141	if (cons_connected) {	172	if (cons_connected) {
142	ipc_answer_0(iid, ELIMIT);	173	ipc_answer_0(iid, ELIMIT);
143	return;	174	return;
144	}	175	}
145	cons_connected = 1;	176	cons_connected = 1;
146	ipc_answer_0(iid, EOK);	177	ipc_answer_0(iid, EOK);
147		178
148	while (1) {	179	while (1) {
149	callid = async_get_call(&call);	180	callid = async_get_call(&call);
150	switch (IPC_GET_METHOD(call)) {	181	switch (IPC_GET_METHOD(call)) {
151	case IPC_M_PHONE_HUNGUP:	182	case IPC_M_PHONE_HUNGUP:
152	cons_connected = 0;	183	cons_connected = 0;
153	ipc_hangup(phone2cons);	184	ipc_hangup(phone2cons);
154	phone2cons = -1;	185	phone2cons = -1;
155	ipc_answer_0(callid, EOK);	186	ipc_answer_0(callid, EOK);
156	return;	187	return;
157	case IPC_M_CONNECT_TO_ME:	188	case IPC_M_CONNECT_TO_ME:
158	if (phone2cons != -1) {	189	if (phone2cons != -1) {
159	retval = ELIMIT;	190	retval = ELIMIT;
160	break;	191	break;
161	}	192	}
162	phone2cons = IPC_GET_ARG5(call);	193	phone2cons = IPC_GET_ARG5(call);
163	retval = 0;	194	retval = 0;
164	break;	195	break;
-		196	case KBD_YIELD:
-		197	kbd_port_yield();
-		198	retval = 0;
-		199	break;
-		200	case KBD_RECLAIM:
-		201	kbd_port_reclaim();
-		202	retval = 0;
-		203	break;
165	default:	204	default:
166	retval = EINVAL;	205	retval = EINVAL;
167	}	206	}
168	ipc_answer_0(callid, retval);	207	ipc_answer_0(callid, retval);
169	}	208	}
170	}	209	}
171		210
172		211
173	int main(int argc, char **argv)	212	int main(int argc, char **argv)
174	{	213	{
175	printf(NAME ": HelenOS Keyboard service\n");	214	printf(NAME ": HelenOS Keyboard service\n");
176		215
177	ipcarg_t phonead;	216	ipcarg_t phonead;
178		217
179	if (sysinfo_value("kbd.cir.fhc") == 1)	218	if (sysinfo_value("kbd.cir.fhc") == 1)
180	cir_service = SERVICE_FHC;	219	cir_service = SERVICE_FHC;
181	else if (sysinfo_value("kbd.cir.obio") == 1)	220	else if (sysinfo_value("kbd.cir.obio") == 1)
182	cir_service = SERVICE_OBIO;	221	cir_service = SERVICE_OBIO;
183		222
184	if (cir_service) {	223	if (cir_service) {
185	while (cir_phone < 0) {	224	while (cir_phone < 0) {
186	cir_phone = ipc_connect_me_to_blocking(PHONE_NS, cir_service,	225	cir_phone = ipc_connect_me_to_blocking(PHONE_NS, cir_service,
187	0, 0);	226	0, 0);
188	}	227	}
189	}	228	}
190		229
191	/* Initialize port driver. */	230	/* Initialize port driver. */
192	if (kbd_port_init() != 0)	231	if (kbd_port_init() != 0)
193	return -1;	232	return -1;
194		233
195	/* Initialize controller driver. */	234	/* Initialize controller driver. */
196	if (kbd_ctl_init() != 0)	235	if (kbd_ctl_init() != 0)
197	return -1;	236	return -1;
-		237
-		238	/* Initialize (reset) layout. */
-		239	layout[active_layout]->reset();
198		240
199	/* Initialize key buffer */	241	/* Initialize key buffer */
200	keybuffer_init(&keybuffer);	242	keybuffer_init(&keybuffer);
201		243
202	async_set_client_connection(console_connection);	244	async_set_client_connection(console_connection);
203		245
204	/* Register service at nameserver. */	246	/* Register service at nameserver. */
205	if (ipc_connect_to_me(PHONE_NS, SERVICE_KEYBOARD, 0, 0, &phonead) != 0)	247	if (ipc_connect_to_me(PHONE_NS, SERVICE_KEYBOARD, 0, 0, &phonead) != 0)
206	return -1;	248	return -1;
207		249
208	printf(NAME ": Accepting connections\n");	250	printf(NAME ": Accepting connections\n");
209	async_manager();	251	async_manager();
210		252
211	/* Not reached. */	253	/* Not reached. */
212	return 0;	254	return 0;
213	}	255	}
214		256
215	/**	257	/**
216	* @}	258	* @}
217	*/	259	*/
218		260

Subversion Repositories HelenOS

(root)/branches/dynload/uspace/srv/kbd/generic/kbd.c @ 4691 – Rev 4346 → 4348