Re: [BK PULL] (3/9) PCMCIA changes

From: Russell King (rmk@arm.linux.org.uk)
Date: Wed Mar 26 2003 - 14:36:01 EST

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.889.359.2 -> 1.889.359.3
# drivers/pcmcia/cs_internal.h 1.5 -> 1.6
# drivers/pcmcia/cs.c 1.17 -> 1.18
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/03/17 rmk@flint.arm.linux.org.uk 1.889.359.3
# [PCMCIA] pcmcia-4: introduce SOCKET_CARDBUS_CONFIG
#
# Cardbus uses socket->cb_config to detect when the cardbus card has
# been initialised. Since cb_config will eventually die, we need a
# solution - introduce the SOCKET_CARDBUS_CONFIG flag, which is set
# once we have initialised the cardbus socket.
# --------------------------------------------
#
diff -Nru a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c
--- a/drivers/pcmcia/cs.c Wed Mar 26 19:19:46 2003
+++ b/drivers/pcmcia/cs.c Wed Mar 26 19:19:46 2003
@@ -621,8 +621,10 @@
                 send_event(s, CS_EVENT_PM_RESUME, CS_EVENT_PRI_LOW);
         } else if (s->state & SOCKET_SETUP_PENDING) {
 #ifdef CONFIG_CARDBUS
- if (s->state & SOCKET_CARDBUS)
+ if (s->state & SOCKET_CARDBUS) {
                 cb_alloc(s);
+ s->state |= SOCKET_CARDBUS_CONFIG;
+ }
 #endif
             send_event(s, CS_EVENT_CARD_INSERTION, CS_EVENT_PRI_LOW);
             s->state &= ~SOCKET_SETUP_PENDING;
@@ -1072,7 +1074,7 @@
         config->Vcc = s->socket.Vcc;
         config->Vpp1 = config->Vpp2 = s->socket.Vpp;
         config->Option = s->cap.cb_dev->subordinate->number;
- if (s->cb_config) {
+ if (s->state & SOCKET_CARDBUS_CONFIG) {
             config->Attributes = CONF_VALID_CLIENT;
             config->IntType = INT_CARDBUS;
             config->AssignedIRQ = s->irq.AssignedIRQ;
diff -Nru a/drivers/pcmcia/cs_internal.h b/drivers/pcmcia/cs_internal.h
--- a/drivers/pcmcia/cs_internal.h Wed Mar 26 19:19:46 2003
+++ b/drivers/pcmcia/cs_internal.h Wed Mar 26 19:19:46 2003
@@ -176,6 +176,7 @@
 #define SOCKET_IO_REQ(i) (0x1000<<(i))
 #define SOCKET_REGION_INFO 0x4000
 #define SOCKET_CARDBUS 0x8000
+#define SOCKET_CARDBUS_CONFIG 0x10000
 
 #define CHECK_HANDLE(h) \
     (((h) == NULL) || ((h)->client_magic != CLIENT_MAGIC)) 

-- 
Russell King (rmk@arm.linux.org.uk)                The developer of ARM Linux
             http://www.arm.linux.org.uk/personal/aboutme.html

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

This archive was generated by hypermail 2b29 : Mon Mar 31 2003 - 22:00:25 EST